From 2d9e345da4f9174fbf270c66ef9d1fb5868b2e26 Mon Sep 17 00:00:00 2001
From: Susanne Moog <susanne.moog@typo3.com>
Date: Sat, 4 Feb 2017 15:29:09 +0100
Subject: [PATCH] [BUGFIX] Add missing namespace parts

As the main test case files are now
in subfolders, we need to correct the
namespaces.

Change-Id: Ie06edc099c5d3e42ff842eded03cde1ddf34c0ca
Releases: master
Resolves: #79629
Reviewed-on: https://review.typo3.org/51535
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
 .../Classes/Core/Acceptance/AcceptanceCoreEnvironment.php   | 2 +-
 .../Classes/Core/Functional/FunctionalTestCase.php          | 6 ++++--
 .../testing_framework/Classes/Core/Unit/UnitTestCase.php    | 5 +++--
 .../Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php       | 2 +-
 .../Resources/Core/Build/AcceptanceTests.yml                | 2 +-
 .../testing_framework/compat/core/FunctionalTestCase.php    | 2 +-
 components/testing_framework/compat/core/UnitTestCase.php   | 2 +-
 .../Controller/Page/LocalizationControllerTest.php          | 2 +-
 .../TypoScript/ConditionMatching/ConditionMatcherTest.php   | 2 +-
 .../Tests/Unit/Controller/EditDocumentControllerTest.php    | 2 +-
 .../Tests/Unit/Controller/File/FileControllerTest.php       | 2 +-
 .../Tests/Unit/Controller/FormInlineAjaxControllerTest.php  | 2 +-
 .../Unit/Controller/FormSelectTreeAjaxControllerTest.php    | 2 +-
 .../backend/Tests/Unit/Controller/LoginControllerTest.php   | 2 +-
 .../Tests/Unit/Controller/PageLayoutControllerTest.php      | 2 +-
 .../Unit/Controller/Wizard/SuggestWizardControllerTest.php  | 2 +-
 .../Tests/Unit/Form/Element/AbstractFormElementTest.php     | 2 +-
 .../Tests/Unit/Form/Element/InputDateTimeElementTest.php    | 2 +-
 .../Tests/Unit/Form/Element/InputHiddenElementTest.php      | 2 +-
 .../sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php | 2 +-
 .../Tests/Unit/Form/FormDataGroup/FlexFormSegmentTest.php   | 2 +-
 .../Unit/Form/FormDataGroup/InlineParentRecordTest.php      | 2 +-
 .../backend/Tests/Unit/Form/FormDataGroup/OnTheFlyTest.php  | 2 +-
 .../Unit/Form/FormDataGroup/OrderedProviderListTest.php     | 2 +-
 .../Tests/Unit/Form/FormDataGroup/TcaDatabaseRecordTest.php | 2 +-
 .../Form/FormDataGroup/TcaInputPlaceholderRecordTest.php    | 2 +-
 .../Unit/Form/FormDataProvider/DatabaseEditRowTest.php      | 2 +-
 .../Unit/Form/FormDataProvider/DatabaseEffectivePidTest.php | 2 +-
 .../Unit/Form/FormDataProvider/DatabaseLanguageRowsTest.php | 2 +-
 .../DatabasePageLanguageOverlayRowsTest.php                 | 2 +-
 .../Form/FormDataProvider/DatabaseParentPageRowTest.php     | 2 +-
 .../FormDataProvider/DatabaseRecordOverrideValuesTest.php   | 2 +-
 .../Form/FormDataProvider/DatabaseRecordTypeValueTest.php   | 2 +-
 .../Form/FormDataProvider/DatabaseRowDateTimeFieldsTest.php | 2 +-
 .../Form/FormDataProvider/DatabaseRowDefaultValuesTest.php  | 2 +-
 .../Form/FormDataProvider/DatabaseRowInitializeNewTest.php  | 2 +-
 .../FormDataProvider/DatabaseSystemLanguageRowsTest.php     | 2 +-
 .../Form/FormDataProvider/DatabaseUniqueUidNewRowTest.php   | 2 +-
 .../FormDataProvider/DatabaseUserPermissionCheckTest.php    | 2 +-
 .../Form/FormDataProvider/EvaluateDisplayConditionsTest.php | 2 +-
 .../Form/FormDataProvider/InitializeProcessedTcaTest.php    | 2 +-
 .../Form/FormDataProvider/InlineOverrrideChildTcaTest.php   | 2 +-
 .../Unit/Form/FormDataProvider/PageTsConfigMergedTest.php   | 2 +-
 .../Tests/Unit/Form/FormDataProvider/ParentPageTcaTest.php  | 2 +-
 .../Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php     | 2 +-
 .../Unit/Form/FormDataProvider/TcaColumnsOverridesTest.php  | 2 +-
 .../Form/FormDataProvider/TcaColumnsProcessCommonTest.php   | 2 +-
 .../FormDataProvider/TcaColumnsProcessFieldLabelsTest.php   | 2 +-
 .../FormDataProvider/TcaColumnsProcessPlaceholdersTest.php  | 2 +-
 .../FormDataProvider/TcaColumnsProcessRecordTitleTest.php   | 2 +-
 .../Form/FormDataProvider/TcaColumnsProcessShowitemTest.php | 2 +-
 .../Form/FormDataProvider/TcaColumnsRemoveUnusedTest.php    | 2 +-
 .../Tests/Unit/Form/FormDataProvider/TcaFlexPrepareTest.php | 2 +-
 .../Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php | 2 +-
 .../Tests/Unit/Form/FormDataProvider/TcaGroupTest.php       | 2 +-
 .../Form/FormDataProvider/TcaInlineConfigurationTest.php    | 2 +-
 .../FormDataProvider/TcaInlineExpandCollapseStateTest.php   | 2 +-
 .../FormDataProvider/TcaInlineIsOnSymmetricSideTest.php     | 2 +-
 .../Tests/Unit/Form/FormDataProvider/TcaInlineTest.php      | 2 +-
 .../Unit/Form/FormDataProvider/TcaInputPlaceholdersTest.php | 2 +-
 .../Tests/Unit/Form/FormDataProvider/TcaRadioItemsTest.php  | 2 +-
 .../Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php | 2 +-
 .../Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php | 2 +-
 .../Unit/Form/FormDataProvider/TcaSelectTreeItemsTest.php   | 2 +-
 .../Tests/Unit/Form/FormDataProvider/TcaTextTest.php        | 2 +-
 .../Unit/Form/FormDataProvider/TcaTypesShowitemTest.php     | 2 +-
 .../Tests/Unit/Form/FormDataProvider/UserTsConfigTest.php   | 2 +-
 .../backend/Tests/Unit/Form/InlineStackProcessorTest.php    | 2 +-
 typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php    | 2 +-
 .../Tests/Unit/Form/Utility/FormEngineUtilityTest.php       | 2 +-
 .../backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php    | 2 +-
 typo3/sysext/backend/Tests/Unit/Module/ModuleLoaderTest.php | 2 +-
 .../Template/Components/Button/FullyRenderedButtonTest.php  | 2 +-
 .../Unit/Template/Components/Button/InputButtonTest.php     | 2 +-
 .../Unit/Template/Components/Button/LinkButtonTest.php      | 2 +-
 .../Unit/Template/Components/Button/SplitButtonTest.php     | 2 +-
 .../Tests/Unit/Template/Components/Menu/MenuItemTest.php    | 2 +-
 .../backend/Tests/Unit/Template/Components/MenuTest.php     | 2 +-
 .../backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php   | 2 +-
 .../Tests/Unit/Tree/SortedTreeNodeCollectionTest.php        | 2 +-
 .../backend/Tests/Unit/Tree/TreeNodeCollectionTest.php      | 2 +-
 typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php       | 2 +-
 .../backend/Tests/Unit/Utility/BackendUtilityTest.php       | 2 +-
 .../Unit/View/BackendLayout/BackendLayoutCollectionTest.php | 2 +-
 .../Tests/Unit/View/BackendLayout/BackendLayoutTest.php     | 2 +-
 .../Unit/View/BackendLayout/DataProviderCollectionTest.php  | 2 +-
 .../backend/Tests/Unit/View/BackendLayoutViewTest.php       | 2 +-
 .../sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php | 2 +-
 typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php | 2 +-
 .../Unit/Domain/Repository/HistoryEntryRepositoryTest.php   | 2 +-
 .../Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php | 2 +-
 .../Unit/Domain/Repository/WorkspaceRepositoryTest.php      | 2 +-
 .../beuser/Tests/Unit/Domain/Model/BackendUserTest.php      | 2 +-
 typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php  | 2 +-
 .../Unit/Domain/Repository/BackendUserRepositoryTest.php    | 2 +-
 .../Domain/Repository/BackendUserSessionRepositoryTest.php  | 2 +-
 .../Tests/Unit/Service/ModuleDataStorageServiceTest.php     | 2 +-
 .../Functional/Cache/Backend/Typo3DatabaseBackendTest.php   | 2 +-
 .../Functional/Cache/Frontend/VariableFrontendTest.php      | 2 +-
 .../Category/Collection/CategoryCollectionTest.php          | 2 +-
 .../Collection/RecordCollectionRepositoryTest.php           | 2 +-
 .../DataHandling/AbstractDataHandlerActionTestCase.php      | 2 +-
 .../Functional/DataHandling/DataHandler/GetUniqueTest.php   | 2 +-
 .../Tests/Functional/Database/DatabaseConnectionTest.php    | 4 ++--
 .../Tests/Functional/Database/PreparedStatementTest.php     | 2 +-
 .../Tests/Functional/Database/Schema/SchemaMigratorTest.php | 2 +-
 .../core/Tests/Functional/Log/Writer/DatabaseWriterTest.php | 2 +-
 .../Tests/Functional/Messaging/FlashMessageQueueTest.php    | 2 +-
 .../sysext/core/Tests/Functional/Page/PageRendererTest.php  | 2 +-
 typo3/sysext/core/Tests/Functional/RegistryTest.php         | 2 +-
 .../core/Tests/Functional/Resource/ResourceStorageTest.php  | 2 +-
 .../Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php | 2 +-
 .../Tests/Functional/Tca/BackendUsersVisibleFieldsTest.php  | 2 +-
 .../core/Tests/Functional/Tca/CategoryVisibleFieldsTest.php | 2 +-
 .../Tests/Functional/Tca/CollectionVisibleFieldsTest.php    | 2 +-
 .../Functional/Tca/FileCollectionVisibleFieldsTest.php      | 2 +-
 .../Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php  | 2 +-
 .../Tests/Functional/Tca/FileStorageVisibleFieldsTest.php   | 2 +-
 .../Tests/Functional/Tca/FilemountsVisibleFieldsTest.php    | 2 +-
 .../core/Tests/Functional/Tca/LanguageVisibleFieldsTest.php | 2 +-
 .../core/Tests/Functional/Tca/NewsVisibleFieldsTest.php     | 2 +-
 .../core/Tests/Functional/Tca/PagesVisibleFieldsTest.php    | 2 +-
 .../Functional/TypoScript/Parser/TypoScriptParserTest.php   | 2 +-
 typo3/sysext/core/Tests/Integrity/IntegrityTest.php         | 2 +-
 .../core/Tests/Legacy/typo3/contrib/class.removexssTest.php | 2 +-
 .../Unit/Authentication/AbstractUserAuthenticationTest.php  | 2 +-
 .../Unit/Authentication/BackendUserAuthenticationTest.php   | 2 +-
 .../core/Tests/Unit/Cache/Backend/AbstractBackendTest.php   | 2 +-
 .../sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php | 2 +-
 .../core/Tests/Unit/Cache/Backend/ApcuBackendTest.php       | 4 ++--
 .../core/Tests/Unit/Cache/Backend/FileBackendTest.php       | 2 +-
 .../core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php  | 2 +-
 .../sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php | 2 +-
 .../core/Tests/Unit/Cache/Backend/RedisBackendTest.php      | 2 +-
 .../Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php | 2 +-
 .../Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php   | 2 +-
 .../core/Tests/Unit/Cache/Backend/WincacheBackendTest.php   | 2 +-
 typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php     | 2 +-
 .../core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php | 2 +-
 .../core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php      | 2 +-
 .../core/Tests/Unit/Cache/Frontend/StringFrontendTest.php   | 2 +-
 .../core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php | 2 +-
 .../core/Tests/Unit/Category/CategoryRegistryTest.php       | 2 +-
 .../Unit/Category/Collection/CategoryCollectionTest.php     | 2 +-
 .../sysext/core/Tests/Unit/Charset/CharsetConverterTest.php | 2 +-
 .../Tests/Unit/Configuration/ConfigurationManagerTest.php   | 2 +-
 .../Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php | 2 +-
 .../Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php  | 3 +--
 typo3/sysext/core/Tests/Unit/Configuration/RichtextTest.php | 2 +-
 .../ConditionMatching/AbstractConditionMatcherTest.php      | 2 +-
 .../sysext/core/Tests/Unit/Core/ApplicationContextTest.php  | 2 +-
 .../Unit/Core/ClassLoadingInformationGeneratorTest.php      | 2 +-
 .../core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php   | 2 +-
 typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php          | 2 +-
 .../sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php | 4 ++--
 .../sysext/core/Tests/Unit/Database/ConnectionPoolTest.php  | 2 +-
 typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php    | 2 +-
 .../core/Tests/Unit/Database/DatabaseConnectionTest.php     | 4 ++--
 .../core/Tests/Unit/Database/PreparedStatementTest.php      | 2 +-
 .../core/Tests/Unit/Database/Query/BulkInsertTest.php       | 2 +-
 .../Database/Query/Expression/ExpressionBuilderTest.php     | 2 +-
 .../core/Tests/Unit/Database/Query/QueryBuilderTest.php     | 2 +-
 .../core/Tests/Unit/Database/Query/QueryHelperTest.php      | 2 +-
 .../Query/Restriction/AbstractRestrictionTestCase.php       | 2 +-
 .../sysext/core/Tests/Unit/Database/RelationHandlerTest.php | 2 +-
 .../Tests/Unit/Database/Schema/ConnectionMigratorTest.php   | 2 +-
 .../EventListener/SchemaColumnDefinitionListenerTest.php    | 2 +-
 .../Database/Schema/Parser/AbstractDataTypeBaseTestCase.php | 2 +-
 .../Schema/Parser/ColumnDefinitionAttributesTest.php        | 2 +-
 .../Database/Schema/Parser/ColumnDefinitionItemTest.php     | 2 +-
 .../Unit/Database/Schema/Parser/CreateTableFragmentTest.php | 2 +-
 .../Database/Schema/Parser/ForeignKeyDefinitionTest.php     | 2 +-
 .../Unit/Database/Schema/Parser/IndexDefinitionTest.php     | 2 +-
 .../Unit/Database/Schema/Parser/ReferenceDefinitionTest.php | 2 +-
 .../Tests/Unit/Database/Schema/Parser/TableBuilderTest.php  | 2 +-
 .../Tests/Unit/Database/Schema/Parser/TableOptionsTest.php  | 2 +-
 .../core/Tests/Unit/Database/Schema/SqlReaderTest.php       | 2 +-
 .../core/Tests/Unit/Database/Schema/Types/EnumTypeTest.php  | 2 +-
 .../core/Tests/Unit/Database/Schema/Types/SetTypeTest.php   | 2 +-
 .../core/Tests/Unit/Encoder/JavaScriptEncoderTest.php       | 2 +-
 .../core/Tests/Unit/Error/DebugExceptionHandlerTest.php     | 2 +-
 .../Tests/Unit/Error/ProductionExceptionHandlerTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/FileStreamWrapperTest.php      | 2 +-
 .../Unit/FormProtection/AbstractFormProtectionTest.php      | 2 +-
 .../Tests/Unit/FormProtection/BackendFormProtectionTest.php | 2 +-
 .../Tests/Unit/FormProtection/FormProtectionFactoryTest.php | 2 +-
 .../Unit/FormProtection/InstallToolFormProtectionTest.php   | 2 +-
 typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php        | 2 +-
 typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/Http/MessageTest.php           | 2 +-
 typo3/sysext/core/Tests/Unit/Http/RequestTest.php           | 2 +-
 typo3/sysext/core/Tests/Unit/Http/ResponseTest.php          | 2 +-
 .../core/Tests/Unit/Http/ServerRequestFactoryTest.php       | 2 +-
 typo3/sysext/core/Tests/Unit/Http/ServerRequestTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/Http/StreamTest.php            | 2 +-
 typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php      | 2 +-
 typo3/sysext/core/Tests/Unit/Http/UriTest.php               | 2 +-
 typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php      | 2 +-
 .../core/Tests/Unit/Imaging/GraphicalFunctionsTest.php      | 2 +-
 typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php    | 2 +-
 .../Unit/Imaging/IconProvider/BitmapIconProviderTest.php    | 2 +-
 .../Imaging/IconProvider/FontawesomeIconProviderTest.php    | 2 +-
 .../Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php | 2 +-
 typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php   | 2 +-
 typo3/sysext/core/Tests/Unit/Imaging/IconTest.php           | 2 +-
 .../core/Tests/Unit/LinkHandling/EmailLinkHandlerTest.php   | 2 +-
 .../core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php    | 2 +-
 .../core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php  | 2 +-
 .../Unit/LinkHandling/LegacyLinkNotationConverterTest.php   | 2 +-
 .../sysext/core/Tests/Unit/LinkHandling/LinkServiceTest.php | 2 +-
 .../core/Tests/Unit/LinkHandling/PageLinkHandlerTest.php    | 2 +-
 .../core/Tests/Unit/LinkHandling/UrlLinkHandlerTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php   | 2 +-
 .../Tests/Unit/Localization/LocalizationFactoryTest.php     | 2 +-
 .../Unit/Localization/Parser/LocallangXmlParserTest.php     | 2 +-
 .../core/Tests/Unit/Localization/Parser/XliffParserTest.php | 2 +-
 .../sysext/core/Tests/Unit/Locking/FileLockStrategyTest.php | 2 +-
 typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php    | 2 +-
 .../core/Tests/Unit/Locking/SemaphoreLockStrategyTest.php   | 2 +-
 .../core/Tests/Unit/Locking/SimpleLockStrategyTest.php      | 2 +-
 typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php           | 2 +-
 typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php         | 2 +-
 typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php          | 2 +-
 typo3/sysext/core/Tests/Unit/Log/LoggerTest.php             | 2 +-
 .../core/Tests/Unit/Log/Processor/AbstractMemoryTest.php    | 2 +-
 .../core/Tests/Unit/Log/Processor/AbstractProcessorTest.php | 2 +-
 .../Tests/Unit/Log/Processor/IntrospectionProcessorTest.php | 2 +-
 .../Unit/Log/Processor/MemoryPeakUsageProcessorTest.php     | 2 +-
 .../Tests/Unit/Log/Processor/MemoryUsageProcessorTest.php   | 2 +-
 .../core/Tests/Unit/Log/Processor/WebProcessorTest.php      | 2 +-
 .../core/Tests/Unit/Log/Writer/AbstractWriterTest.php       | 2 +-
 .../core/Tests/Unit/Log/Writer/DatabaseWriterTest.php       | 2 +-
 typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php  | 2 +-
 typo3/sysext/core/Tests/Unit/Mail/MailMessageTest.php       | 2 +-
 typo3/sysext/core/Tests/Unit/Mail/MailerTest.php            | 2 +-
 .../Unit/Messaging/FlashMessageRendererResolverTest.php     | 2 +-
 .../core/Tests/Unit/Messaging/FlashMessageServiceTest.php   | 2 +-
 .../Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php | 2 +-
 .../core/Tests/Unit/Messaging/Renderer/ListRendererTest.php | 2 +-
 .../Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php | 2 +-
 .../sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php  | 2 +-
 .../core/Tests/Unit/Package/DependencyResolverTest.php      | 2 +-
 typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php | 2 +-
 typo3/sysext/core/Tests/Unit/Package/PackageTest.php        | 2 +-
 typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php      | 2 +-
 typo3/sysext/core/Tests/Unit/RegistryTest.php               | 2 +-
 typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php  | 2 +-
 typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php      | 2 +-
 .../core/Tests/Unit/Resource/Driver/DriverRegistryTest.php  | 2 +-
 typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php | 2 +-
 typo3/sysext/core/Tests/Unit/Resource/FileTest.php          | 2 +-
 .../core/Tests/Unit/Resource/Filter/FileNameFilterTest.php  | 2 +-
 typo3/sysext/core/Tests/Unit/Resource/FolderTest.php        | 2 +-
 .../Tests/Unit/Resource/Index/ExtractorRegistryTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php | 2 +-
 typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php | 2 +-
 .../Unit/Resource/Processing/LocalPreviewHelperTest.php     | 2 +-
 .../Tests/Unit/Resource/Rendering/AudioTagRendererTest.php  | 2 +-
 .../Tests/Unit/Resource/Rendering/RendererRegistryTest.php  | 2 +-
 .../Tests/Unit/Resource/Rendering/VideoTagRendererTest.php  | 2 +-
 .../Tests/Unit/Resource/Rendering/VimeoRendererTest.php     | 2 +-
 .../Tests/Unit/Resource/Rendering/YouTubeRendererTest.php   | 2 +-
 .../Unit/Resource/Repository/AbstractRepositoryTest.php     | 2 +-
 .../sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php | 2 +-
 .../Unit/Resource/TextExtraction/PlainTextExtractorTest.php | 2 +-
 .../Resource/TextExtraction/TextExtractorRegistryTest.php   | 2 +-
 .../Tests/Unit/Resource/Utility/FileExtensionFilterTest.php | 2 +-
 .../Tests/Unit/Service/DependencyOrderingServiceTest.php    | 2 +-
 .../Tests/Unit/Service/MarkerBasedTemplateServiceTest.php   | 2 +-
 .../TableConfiguration/DatabaseTreeDataProviderTest.php     | 2 +-
 .../Tree/TableConfiguration/TreeDataProviderFactoryTest.php | 2 +-
 typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php       | 2 +-
 typo3/sysext/core/Tests/Unit/Type/File/FileInfoTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/Type/File/ImageInfoTest.php    | 2 +-
 .../Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php   | 2 +-
 .../core/Tests/Unit/TypoScript/TemplateServiceTest.php      | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php   | 2 +-
 .../core/Tests/Unit/Utility/ClassNamingUtilityTest.php      | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php  | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/CommandUtilityTest.php | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/CsvUtilityTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/DebugUtilityTest.php   | 2 +-
 .../Tests/Unit/Utility/ExtensionManagementUtilityTest.php   | 2 +-
 .../Tests/Unit/Utility/File/ExtendedFileUtilityTest.php     | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php | 4 ++--
 typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php    | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php    | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php    | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php    | 2 +-
 .../sysext/core/Tests/Unit/Utility/ResourceUtilityTest.php  | 2 +-
 .../sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php  | 2 +-
 typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php  | 2 +-
 .../core/Tests/Unit/Utility/VersionNumberUtilityTest.php    | 2 +-
 .../Tests/Functional/Tca/ContentVisibleFieldsTest.php       | 2 +-
 .../Tests/Unit/Domain/Model/DocumentFormatTest.php          | 2 +-
 .../documentation/Tests/Unit/Domain/Model/DocumentTest.php  | 2 +-
 .../Tests/Unit/Domain/Model/DocumentTranslationTest.php     | 2 +-
 .../Configuration/BackendConfigurationManagerTest.php       | 2 +-
 .../sysext/extbase/Tests/Functional/Persistence/AddTest.php | 2 +-
 .../extbase/Tests/Functional/Persistence/CountTest.php      | 2 +-
 .../Persistence/Generic/Mapper/DataMapperTest.php           | 2 +-
 .../sysext/extbase/Tests/Functional/Persistence/InTest.php  | 2 +-
 .../extbase/Tests/Functional/Persistence/OperatorTest.php   | 2 +-
 .../Tests/Functional/Persistence/QueryParserTest.php        | 2 +-
 .../extbase/Tests/Functional/Persistence/RelationTest.php   | 2 +-
 .../Tests/Functional/Persistence/TranslationTest.php        | 2 +-
 .../Unit/Configuration/AbstractConfigurationManagerTest.php | 2 +-
 .../Unit/Configuration/BackendConfigurationManagerTest.php  | 2 +-
 .../Unit/Configuration/FrontendConfigurationManagerTest.php | 2 +-
 typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php      | 2 +-
 .../Tests/Unit/Domain/Model/BackendUserGroupTest.php        | 2 +-
 .../extbase/Tests/Unit/Domain/Model/BackendUserTest.php     | 2 +-
 .../sysext/extbase/Tests/Unit/Domain/Model/CategoryTest.php | 2 +-
 .../extbase/Tests/Unit/Domain/Model/FileMountTest.php       | 2 +-
 .../Tests/Unit/Domain/Model/FrontendUserGroupTest.php       | 2 +-
 .../extbase/Tests/Unit/Domain/Model/FrontendUserTest.php    | 2 +-
 .../Domain/Repository/BackendUserGroupRepositoryTest.php    | 2 +-
 .../Unit/Domain/Repository/BackendUserRepositoryTest.php    | 2 +-
 .../Tests/Unit/Domain/Repository/CategoryRepositoryTest.php | 2 +-
 .../Unit/Domain/Repository/FileMountRepositoryTest.php      | 2 +-
 .../extbase/Tests/Unit/DomainObject/AbstractEntityTest.php  | 2 +-
 typo3/sysext/extbase/Tests/Unit/Error/ErrorTest.php         | 2 +-
 typo3/sysext/extbase/Tests/Unit/Error/MessageTest.php       | 2 +-
 typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php        | 2 +-
 .../Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php  | 2 +-
 .../extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php       | 2 +-
 typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php     | 2 +-
 .../extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php       | 2 +-
 typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php     | 2 +-
 .../Tests/Unit/Mvc/Controller/AbstractControllerTest.php    | 2 +-
 .../Tests/Unit/Mvc/Controller/ActionControllerTest.php      | 2 +-
 .../extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php      | 2 +-
 .../extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php     | 2 +-
 .../Tests/Unit/Mvc/Controller/CommandControllerTest.php     | 2 +-
 .../MvcPropertyMappingConfigurationServiceTest.php          | 2 +-
 typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php         | 2 +-
 typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php        | 2 +-
 typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php   | 2 +-
 .../extbase/Tests/Unit/Mvc/Web/CacheHashEnforcerTest.php    | 2 +-
 .../extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php       | 2 +-
 .../extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php   | 2 +-
 .../Tests/Unit/Object/Container/ClassInfoFactoryTest.php    | 2 +-
 .../extbase/Tests/Unit/Object/Container/ContainerTest.php   | 2 +-
 .../extbase/Tests/Unit/Persistence/Generic/BackendTest.php  | 2 +-
 .../Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php  | 4 ++--
 .../Unit/Persistence/Generic/Mapper/DataMapperTest.php      | 4 ++--
 .../Unit/Persistence/Generic/PersistenceManagerTest.php     | 2 +-
 .../Tests/Unit/Persistence/Generic/QueryFactoryTest.php     | 2 +-
 .../Tests/Unit/Persistence/Generic/QueryResultTest.php      | 2 +-
 .../extbase/Tests/Unit/Persistence/Generic/QueryTest.php    | 2 +-
 .../extbase/Tests/Unit/Persistence/Generic/SessionTest.php  | 2 +-
 .../Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php | 2 +-
 .../Persistence/Generic/Storage/Typo3DbQueryParserTest.php  | 2 +-
 .../Unit/Persistence/Generic/Typo3QuerySettingsTest.php     | 2 +-
 .../extbase/Tests/Unit/Persistence/ObjectStorageTest.php    | 2 +-
 .../extbase/Tests/Unit/Persistence/RepositoryTest.php       | 2 +-
 .../extbase/Tests/Unit/Property/PropertyMapperTest.php      | 2 +-
 .../Property/PropertyMappingConfigurationBuilderTest.php    | 2 +-
 .../Unit/Property/PropertyMappingConfigurationTest.php      | 2 +-
 .../Unit/Property/TypeConverter/ArrayConverterTest.php      | 2 +-
 .../Unit/Property/TypeConverter/BooleanConverterTest.php    | 2 +-
 .../Unit/Property/TypeConverter/DateTimeConverterTest.php   | 2 +-
 .../Unit/Property/TypeConverter/FloatConverterTest.php      | 2 +-
 .../Unit/Property/TypeConverter/IntegerConverterTest.php    | 2 +-
 .../Unit/Property/TypeConverter/ObjectConverterTest.php     | 2 +-
 .../TypeConverter/PersistentObjectConverterTest.php         | 2 +-
 .../Unit/Property/TypeConverter/StringConverterTest.php     | 2 +-
 .../extbase/Tests/Unit/Reflection/ClassSchemaTest.php       | 2 +-
 .../extbase/Tests/Unit/Reflection/DocCommentParserTest.php  | 2 +-
 .../extbase/Tests/Unit/Reflection/ObjectAccessTest.php      | 2 +-
 .../extbase/Tests/Unit/Reflection/ReflectionServiceTest.php | 2 +-
 .../extbase/Tests/Unit/Scheduler/FieldProviderTest.php      | 2 +-
 typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php      | 2 +-
 .../Tests/Unit/Security/Cryptography/HashServiceTest.php    | 2 +-
 .../sysext/extbase/Tests/Unit/Service/CacheServiceTest.php  | 2 +-
 .../extbase/Tests/Unit/Service/ExtensionServiceTest.php     | 2 +-
 .../extbase/Tests/Unit/Service/FlexFormServiceTest.php      | 2 +-
 .../extbase/Tests/Unit/Service/ImageScriptServiceTest.php   | 2 +-
 .../extbase/Tests/Unit/Service/TypoScriptServiceTest.php    | 2 +-
 .../sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php | 2 +-
 .../sysext/extbase/Tests/Unit/Utility/ArrayUtilityTest.php  | 2 +-
 .../extbase/Tests/Unit/Utility/DebuggerUtilityTest.php      | 2 +-
 .../extbase/Tests/Unit/Utility/ExtensionUtilityTest.php     | 2 +-
 .../extbase/Tests/Unit/Utility/LocalizationUtilityTest.php  | 2 +-
 .../Validation/Validator/AbstractCompositeValidatorTest.php | 2 +-
 .../Unit/Validation/Validator/AbstractValidatorTest.php     | 2 +-
 .../Unit/Validation/Validator/AbstractValidatorTestcase.php | 2 +-
 .../Unit/Validation/Validator/AlphanumericValidatorTest.php | 2 +-
 .../Unit/Validation/Validator/CollectionValidatorTest.php   | 2 +-
 .../Unit/Validation/Validator/ConjunctionValidatorTest.php  | 2 +-
 .../Unit/Validation/Validator/DisjunctionValidatorTest.php  | 2 +-
 .../Unit/Validation/Validator/EmailAddressValidatorTest.php | 2 +-
 .../Unit/Validation/Validator/NumberRangeValidatorTest.php  | 2 +-
 .../Tests/Unit/Validation/Validator/NumberValidatorTest.php | 2 +-
 .../Validation/Validator/RegularExpressionValidatorTest.php | 2 +-
 .../Unit/Validation/Validator/StringLengthValidatorTest.php | 2 +-
 .../extbase/Tests/Unit/Validation/ValidatorResolverTest.php | 2 +-
 .../Tests/Unit/Controller/DownloadControllerTest.php        | 2 +-
 .../Tests/Unit/Controller/UpdateFromTerControllerTest.php   | 4 ++--
 .../Unit/Controller/UploadExtensionFileControllerTest.php   | 2 +-
 .../Tests/Unit/Domain/Model/DownloadQueueTest.php           | 2 +-
 .../Tests/Unit/Domain/Model/ExtensionTest.php               | 2 +-
 .../Domain/Repository/ConfigurationItemRepositoryTest.php   | 2 +-
 .../Unit/Domain/Repository/RepositoryRepositoryTest.php     | 2 +-
 .../Tests/Unit/Report/ExtensionStatusTest.php               | 2 +-
 .../Tests/Unit/Service/ExtensionManagementServiceTest.php   | 2 +-
 .../Tests/Unit/Task/UpdateExtensionListTaskTest.php         | 2 +-
 .../Tests/Unit/Utility/ConfigurationUtilityTest.php         | 2 +-
 .../Tests/Unit/Utility/DependencyUtilityTest.php            | 2 +-
 .../Tests/Unit/Utility/EmConfUtilityTest.php                | 2 +-
 .../Tests/Unit/Utility/ExtensionModelUtilityTest.php        | 2 +-
 .../Tests/Unit/Utility/FileHandlingUtilityTest.php          | 2 +-
 .../Tests/Unit/Utility/InstallUtilityTest.php               | 2 +-
 .../extensionmanager/Tests/Unit/Utility/ListUtilityTest.php | 2 +-
 .../Tests/Functional/Tca/ContentVisibleFieldsTest.php       | 2 +-
 .../Tests/Unit/Controller/FrontendLoginControllerTest.php   | 2 +-
 .../Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php  | 2 +-
 .../Functional/EscapeChildrenRenderingStandaloneTest.php    | 2 +-
 .../fluid/Tests/Functional/EscapeChildrenRenderingTest.php  | 2 +-
 .../fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php  | 2 +-
 .../PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php | 2 +-
 .../Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php | 2 +-
 .../Tests/Unit/Core/Rendering/RenderingContextTest.php      | 2 +-
 .../Tests/Unit/Core/Variables/CmsVariableProviderTest.php   | 2 +-
 .../Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php   | 2 +-
 .../Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php   | 2 +-
 .../Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php   | 2 +-
 .../Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php | 2 +-
 .../Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php | 2 +-
 .../Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php  | 2 +-
 .../fluid/Tests/Unit/Core/Widget/WidgetContextTest.php      | 2 +-
 .../Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php     | 2 +-
 .../Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php     | 2 +-
 .../fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php      | 2 +-
 .../fluid/Tests/Unit/View/AbstractTemplateViewTest.php      | 4 ++--
 typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php   | 2 +-
 typo3/sysext/fluid/Tests/Unit/View/TemplatePathsTest.php    | 2 +-
 .../fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php    | 2 +-
 .../Widget/Controller/PaginateControllerTest.php            | 2 +-
 .../Tests/Functional/Tca/ContentVisibleFieldsTest.php       | 2 +-
 .../Tests/Unit/Controller/AbstractBackendControllerTest.php | 2 +-
 .../form/Tests/Unit/Controller/FormEditorControllerTest.php | 2 +-
 .../Tests/Unit/Controller/FormFrontendControllerTest.php    | 2 +-
 .../Tests/Unit/Controller/FormManagerControllerTest.php     | 2 +-
 .../Unit/Domain/Configuration/ConfigurationServiceTest.php  | 2 +-
 .../Tests/Unit/Domain/Finishers/AbstractFinisherTest.php    | 2 +-
 .../Tests/Unit/Domain/FormElements/AbstractSectionTest.php  | 2 +-
 .../form/Tests/Unit/Domain/Runtime/FormRuntimeTest.php      | 2 +-
 .../Tests/Unit/Hooks/DataStructureIdentifierHookTest.php    | 2 +-
 .../Mvc/Configuration/InheritancesResolverServiceTest.php   | 2 +-
 .../Tests/Unit/Mvc/Configuration/TypoScriptServiceTest.php  | 2 +-
 .../form/Tests/Unit/Mvc/Configuration/YamlSourceTest.php    | 2 +-
 .../Unit/Mvc/Persistence/FormPersistenceManagerTest.php     | 2 +-
 typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php     | 2 +-
 .../form/Tests/Unit/Mvc/Validation/CountValidatorTest.php   | 2 +-
 .../form/Tests/Unit/Mvc/Validation/EmptyValidatorTest.php   | 2 +-
 .../Tests/Unit/Mvc/Validation/MimeTypeValidatorTest.php     | 2 +-
 .../form/Tests/Unit/Service/TranslationServiceTest.php      | 2 +-
 .../Unit/ViewHelpers/Form/DatePickerViewHelperTest.php      | 2 +-
 .../Functional/ContentObject/ContentObjectRendererTest.php  | 2 +-
 .../ContentObject/FluidTemplateContentObjectTest.php        | 2 +-
 .../Controller/TypoScriptFrontendControllerTest.php         | 2 +-
 .../frontend/Tests/Functional/Page/PageRepositoryTest.php   | 2 +-
 .../Tests/Functional/Tca/BackendLayoutVisibleFieldsTest.php | 2 +-
 .../Tests/Functional/Tca/ContentVisibleFieldsTest.php       | 2 +-
 .../Tests/Functional/Tca/DomainVisibleFieldsTest.php        | 2 +-
 .../Functional/Tca/FrontendGroupsVisibleFieldsTest.php      | 2 +-
 .../Tests/Functional/Tca/FrontendUsersVisibleFieldsTest.php | 2 +-
 .../Tca/PagesLanguageOverlayVisibleFieldsTest.php           | 2 +-
 .../Tests/Functional/Tca/TemplateVisibleFieldsTest.php      | 2 +-
 .../TypoScript/ConditionMatching/ConditionMatcherTest.php   | 2 +-
 .../Tests/Unit/ContentObject/CaseContentObjectTest.php      | 2 +-
 .../Tests/Unit/ContentObject/ContentDataProcessorTest.php   | 2 +-
 .../Tests/Unit/ContentObject/ContentObjectRendererTest.php  | 2 +-
 .../Tests/Unit/ContentObject/FilesContentObjectTest.php     | 2 +-
 .../Unit/ContentObject/FluidTemplateContentObjectTest.php   | 2 +-
 .../ContentObject/Menu/AbstractMenuContentObjectTest.php    | 2 +-
 .../ContentObject/Menu/MenuContentObjectFactoryTest.php     | 2 +-
 .../Unit/Controller/TypoScriptFrontendControllerTest.php    | 2 +-
 .../frontend/Tests/Unit/Page/CacheHashCalculatorTest.php    | 2 +-
 typo3/sysext/frontend/Tests/Unit/Page/PageGeneratorTest.php | 2 +-
 .../sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php  | 2 +-
 .../frontend/Tests/Unit/Plugin/AbstractPluginTest.php       | 2 +-
 .../frontend/Tests/Unit/Processor/GalleryProcessorTest.php  | 2 +-
 .../Tests/Unit/Service/TypoLinkCodecServiceTest.php         | 2 +-
 .../sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php  | 2 +-
 .../Tests/Functional/Export/AbstractExportTestCase.php      | 2 +-
 .../Tests/Functional/Tca/IndexConfigVisibleFieldsTest.php   | 2 +-
 .../Tests/Functional/Utility/LikeWildcardTest.php           | 2 +-
 typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php      | 2 +-
 .../Tests/Functional/SqlSchemaMigrationServiceTest.php      | 2 +-
 .../Action/Ajax/ExtensionCompatibilityTesterTest.php        | 2 +-
 .../Tests/Unit/FolderStructure/DefaultFactoryTest.php       | 2 +-
 .../install/Tests/Unit/FolderStructure/LinkNodeTest.php     | 2 +-
 .../install/Tests/Unit/FolderStructure/RootNodeTest.php     | 2 +-
 .../Tests/Unit/FolderStructure/StructureFacadeTest.php      | 2 +-
 typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php | 2 +-
 .../install/Tests/Unit/Service/CoreUpdateServiceTest.php    | 2 +-
 .../install/Tests/Unit/Service/CoreVersionServiceTest.php   | 2 +-
 .../install/Tests/Unit/Service/EnableFileServiceTest.php    | 2 +-
 .../Unit/Service/SilentConfigurationUpgradeServiceTest.php  | 2 +-
 .../Tests/Unit/Service/SqlSchemaMigrationServiceTest.php    | 2 +-
 .../sysext/install/Tests/Unit/Status/StatusUtilityTest.php  | 2 +-
 .../Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php    | 2 +-
 typo3/sysext/install/Tests/Unit/View/JsonViewTest.php       | 2 +-
 typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php | 2 +-
 typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php  | 2 +-
 .../sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php | 2 +-
 .../Unit/RecordList/AbstractDatabaseRecordListTest.php      | 2 +-
 .../Tests/Functional/Recycle/AbstractRecycleTestCase.php    | 2 +-
 .../recycler/Tests/Unit/Task/CleanerFieldProviderTest.php   | 2 +-
 typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php   | 2 +-
 .../reports/Tests/Unit/Report/Status/Typo3StatusTest.php    | 2 +-
 .../rsaauth/Tests/Functional/Storage/SplitStorageTest.php   | 2 +-
 .../rsaauth/Tests/Unit/Backend/CommandLineBackendTest.php   | 2 +-
 typo3/sysext/rsaauth/Tests/Unit/Backend/PhpBackendTest.php  | 2 +-
 typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php             | 2 +-
 .../Tests/Functional/Tca/AcronymVisibleFieldsTest.php       | 2 +-
 .../Tests/Functional/SaltedPasswordServiceTest.php          | 2 +-
 .../Tests/Functional/Task/BulkUpdateTaskTest.php            | 2 +-
 .../Tests/Functional/Utility/SaltedPasswordsUtilityTest.php | 2 +-
 .../saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php | 2 +-
 .../saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php    | 2 +-
 .../sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php  | 2 +-
 .../saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php      | 2 +-
 .../saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php      | 2 +-
 .../saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php     | 2 +-
 .../Tests/Unit/Utility/SaltedPasswordsUtilityTest.php       | 2 +-
 .../Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php     | 2 +-
 .../scheduler/Tests/Unit/CronCommand/CronCommandTest.php    | 2 +-
 .../Tests/Unit/CronCommand/NormalizeCommandTest.php         | 2 +-
 .../Unit/Task/CachingFrameworkGarbageCollectionTest.php     | 2 +-
 typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php | 2 +-
 .../sv/Tests/Functional/AuthenticationServiceTest.php       | 2 +-
 typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php    | 2 +-
 .../sysext/sv/Tests/Unit/Report/ServicesListReportTest.php  | 2 +-
 .../Tests/Functional/Tca/ActionVisibleFieldsTest.php        | 2 +-
 .../sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php | 2 +-
 .../Tests/Functional/ActionHandler/ActionHandlerTest.php    | 2 +-
 .../Tests/Functional/Service/WorkspaceServiceTest.php       | 2 +-
 .../Functional/Tca/WorkspaceStageVisibleFieldsTest.php      | 2 +-
 .../Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php     | 2 +-
 .../Tests/Unit/Controller/Remote/RemoteServerTest.php       | 2 +-
 544 files changed, 558 insertions(+), 556 deletions(-)

diff --git a/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php b/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
index d0e40e21e81a..e1e801cc21b6 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 8bcf12606add..9f9b2a1a218f 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 1bdd50afdc73..ee34c02d0bdc 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 1cd317dba135..e8d7c45f6851 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 e011a8eba4f1..cf8fe76fbc31 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 b7da53a0e137..96feaa16c70c 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 7af4c8cb0916..0c44f010bf84 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 36b7ee209165..80bf1fb56024 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 429722589bcd..999ea2c967b7 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 fbba77eb1dcb..6366c42b5d93 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 428ebb9be840..81de64db5190 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 73f695c0eaf6..d04ad742efe4 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 0253fd8f874a..996b4a496e38 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 4575e9541d2f..4f9216d10020 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 5308a3848548..7d908b818240 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 c489048f7441..35e32f18546b 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 0ff0d956a09b..baf3264374b3 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 c9b8bc2aa195..e8fa178d2c30 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 66ca49703bc8..1269e0cba1ba 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 dc73d2e46b40..95c5126b4958 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 2018cd0c1299..c697c0532726 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 e81a66bf8e02..cade32876429 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 2e71be6d57ba..c6967f32259d 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 87534616b980..939a96b8d1b6 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 3fd2bf3cc86b..f2f3229ff8e4 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 a0f33a8aceec..dacde006a3a6 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 3ff7cd1a4e17..c93099a28685 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 5b678734c157..70473e61d0bb 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 ba63d8918d83..df93e6a552d6 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 7fae2a580b64..ec9c7e6eeddd 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 4a80d19a9a36..5224a3f549f6 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 77229228aae6..d228e63bb8b4 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 901cacbf0d6f..72b53a6e5a0f 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 4e8d4dd2e57f..bb1cec165aeb 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 ed4843d76d21..db2f612a2c17 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 33619934ed93..24824d541178 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 bc7b8914fdf7..37707283cdce 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 6e495e3e9f49..c4e359521ea0 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 4c88f4700073..c62df019f39f 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 087214a295d7..066b7352b95c 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 ef1d3df87ce3..6412df953123 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 2d1dd5477e9d..14e130b69fb2 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 767175a4e20e..9c086fee508a 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 a4fde95e3d6a..d7581497c5b4 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 005d99810fb0..ecaaa30bad7a 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 d3362be1d1fe..b3c37a00b965 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 387488f20a26..d3063120ed5c 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 d4e9e7dde60f..b37dc028a8bf 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 c01d58b5bbf1..4db8c9d8032c 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 88b64f84f906..4bc56b507953 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 5acf009816bf..809c86098fc3 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 5c161858ca67..47f71f06e72f 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 c5290e7600ca..14e86eb30724 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 90954a7f3ee6..e2abdd826afb 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 da45dcdf3021..f98250a4ea41 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 e76b02af946c..203825f3b032 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 4fea6a435f47..bd9b32f7cafd 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 0af62c35409c..c28d3b1c3924 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 49fc50e37fa8..21794ea3bba0 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 7f5c140f54ac..8b1393512832 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 98a428d6b2d1..f8c03f661f2e 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 700b0751c899..75fa6093ec33 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 837b4de4ad47..6185d26ad717 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 5502d2abc1cc..9c8169c209e0 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 50e01605d78b..fcfaa34bf422 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 20d202821a98..d2742f48b5a1 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 9480c6408e42..3ed138021927 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 41a990f13787..1b51ca7a34c0 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 137d4da15af0..677ca15f6531 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 e33580c4333b..7b9dfed511b7 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 b7d12c3b5ed9..d08243da9177 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 4a8eaf038c09..28f94a66e72c 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 6d33a6534ea7..c436bf760706 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 0bc856bb50db..63cb7a1466b3 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 28017a38a339..4a3ba9cbc1eb 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 82b46d28354f..cee923da8ca9 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 2ffd357b13c7..d3f65d067900 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 4bff52c0db02..9ee6ed40c902 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 ce02145ff68a..221ad8245b33 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 bc43d57161e0..9d15966e3608 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 855c4803d5c8..6c852033383d 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 a8cbcaca1774..f210126248d1 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 12c8773d03d4..dbfe3822c213 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 8b6a286b1625..2701e4ff487b 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 ce848b17a80a..0e0bff3bd0bf 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 75f995093832..80d4d0197f92 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 b00a6b853a87..22edc32f9cdf 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 ad2cb39dd8e8..11772d69a54f 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 9b2e024b9262..97b22552eb36 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 eec65888913b..cc3ee806f3be 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 ab5d59ebea45..467405302390 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 c7e971340c10..66fd3ec97a07 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 b321ee9c974a..76e81cc30080 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 bf163750dbf6..67a91956a380 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 667f1fcb51d7..2478c52848ec 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 e9617f58dad4..6d4336363763 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 72616f593119..c17c733cbaea 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 019e2cc42d59..9c2682147e12 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 40d066286512..41955affb1dc 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 0c1732c258a5..f2f19438a92c 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 12b70772dfbd..7e8b4c5de60a 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 5a8d3cc0556f..7fcfaac32c11 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 e088b1f50b94..e5a5299ff9ff 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 f764c8fadf3e..e5e920659b3d 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 197112a3c312..d8917330f803 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 d6e25cdef16b..81b5010938c5 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 de2f34650a5f..0ecee81822f9 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 f848b992fc61..26600e1c41ca 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 51d2797d2fa8..5a98e4036000 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 fc239c85912c..f315819b02e7 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 148148889568..bac2ef9f85b0 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 4d4c6cd224c5..5924bfc7455d 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 6e588f0ba7ae..37b6907272da 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 7a0db3cf3718..1036f9e145c3 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 652871f7f14e..9c0bfb62fa9a 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 92b45ba14ba4..bf843a56f584 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 d9953c99705a..4979ecb1e265 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 31f90756089a..6be0d94f737e 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 26f73e623a1c..fb051ad1aebc 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 4db21091c2cc..b91f7ffb4afd 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 08f53af3a1e9..8e63359c69a6 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 6d6c31542bbd..e22bb25daef8 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 352d0fc3a21e..16467cdc8678 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 51092fb63cb7..dcba5788c3a6 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 95fc0eef18fa..9f443d906182 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 f79311f8389b..9f26675124bd 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 5d13437398ed..20d1dfc7c99d 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 e1aef87171c5..afe43bf19fb3 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 a73f37f44d8c..a5a9a3702a46 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 900bc174c424..448094e121bc 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 ddb2587f9245..767e8488d996 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 0e9a907da9cc..f1040480b7fc 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 c002084c247f..68cdf937ddd0 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 883aec472cb2..db4047c1e244 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 4d2f3b119041..b597c8183c4a 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 5e23570b2d43..c6577ccf7c4b 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 7ab2ae2163cd..b30493b756c7 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 01b3641727be..1cb4974ce8c2 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 8d0b5f6888b2..a5f3309f33f8 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 cb9dd2b9610b..bdd15d10938f 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 cac593b8583f..9b938725c00b 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 f32cf86f6f6b..914514db7319 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 34ac9c9d37fe..bd012fa27fb6 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 97bcb374de36..2d299cd74d6c 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 8f858b033e08..9bba17e3c867 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 09909f1797ae..e75dfbcf9fab 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 703e62b42b9e..d0d2beddbd15 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 0db3d567e80d..8f1f86b136b6 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 edb0393e538e..e0b88542fb7f 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 58244dab719b..9ec200a01bac 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 cb5ddafd55f3..2a1f528bf7e0 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 3611ffa1d24a..1b13c593628e 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 06972fd4c6ae..de30c6284b5a 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 1168c90d1d6a..0d16fc07e3c3 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 4115cdd07d0c..a662361e119f 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 d4c7413ca74b..66ca6483aef1 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 caa9c523f7a0..69ba8e35ff8e 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 fbbbd285fa1f..5c43d26560bf 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 476754af31f5..15d50dba5849 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 9a843a9da63b..a5ccfd71ffcc 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 43451caf06e3..69dcadfcc315 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 3236d5e58f2e..02c6b4c5d0f0 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 c1db965522f4..4be2759df99a 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 62999a9ac6e9..69a0f1891417 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 f2f37d42b2d4..f191a5f58e2f 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 c28544ea7c76..16576319aaf2 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 4444303435f0..cde3d4a75c9a 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 aaeb6544a20c..8b853878bac9 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 d34ee2c55001..47927f27748b 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 dc916b0e86c0..0260e899615f 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 ac54e7a4c3d7..a10fa25103a9 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 d1c39ca1dc69..6158d77131d3 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 06cce8c3cef2..2f50e11c5b33 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 fbf8d1716944..efc6657f633b 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 8f289290b55d..1a8a10cb24ee 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 50794e885a9d..0f9d75e6b916 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 c9a7ea118b4d..b0b91591ff34 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 643967aa068d..2f6f3fe16293 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 d99fdaccd0e5..6ed65b440371 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 dffee9888ad4..04e86f9b71e5 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 642be17cb2e0..be0dcd9de2be 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 0d0afeb1b57f..f3f0ce8db14d 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 037c3cf1b697..5b37d52ee899 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 3686ffebff5a..dc46caeca4e3 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 03dc6c95dfa4..9cbe07246ff7 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 a3f59ebb1b4d..a46d28a0bca9 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 4e97f000d493..bbc51b2ab391 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 ade8f80bbc54..9297447ecd5b 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 c7f166d6ecbe..5443a137ecba 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 7e1da7cc43d1..8a5d7fdae533 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 804645066270..a2ba8b1d62de 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 ef9fdb26c6c6..5cdb5034f9d7 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 16352e0c7931..45f7a8196794 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 ab4112bf4345..c7d414107cc2 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 3b031039722d..8b1aa9565d68 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 c5ecdd80460b..ca946f7198d7 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 21dfbbe1e101..3b1f50efeda1 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 1bfa232dea63..5dcb4c90db9d 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 fc59570a302d..7c44e6c9c884 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 a4606b148c43..be3c92ecba8f 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 97222bd0ef69..d1f0ffc1ab05 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 2ee4a5eaa740..eb7e213e8397 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 b08f6581e6f6..ad3fea829741 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 f12ddbd0b7c1..2b997adc9b67 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 82d1407346ea..a2875408dd73 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 e8eeff5461d5..5f1a50e1b8ec 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 a6a127ea9f68..287dfb6ea2a0 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 f2b24b585387..01261ba0b226 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 91ec1c06e30c..8c30e0c8a578 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 5161d114ee2b..c1b9b1422a19 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 58208329bb51..0e6aea034835 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 49ab7d2c8ff8..2c781b937cfa 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 f569de189279..fb2db609c489 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 399e93c38dfa..57a26d16cd00 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 010784a6f7d4..63b58b368b7a 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 157113bd8810..52f8f286f5c1 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 68ff67a57397..8d390f5483ea 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 5411c7f04e7a..9ed4cd634f4e 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 d107eca3cf00..e5bfa9754661 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 b30e88d31a2a..1858b2d5e480 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 67c0c16f60ef..754822ec9053 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 67e5dba7f268..62b34d4c65ba 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 97c7fd315f76..1f3a4c7b09fd 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 12b161dee346..ef8d55fc3f45 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 8e9796255869..1dc7a7a8f117 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 2a0cc10b9604..39c088e1c875 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 0bd7afc7f782..f00c4f3b6cfb 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 32c1204cf723..3437c23280b0 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 d05b42309be3..101041558c0f 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 3b12f712861f..8c4d2e3f694e 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 e4a6c8b257f1..f7f4651c5a80 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 8f86fbcf5f58..eed18e354954 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 a3371a1a9642..52b45c9fd8f0 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 7517fc0e9211..ab7aa7bc744e 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 3988d5703a86..14831cb22d31 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 13101e1a055c..16d33ad4698c 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 e0c7eff850df..07782520afbb 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 c295f90de839..d0ab77fd0ca9 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 4081d4d4c122..f5edfec842b7 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 b8632b7372ba..78bcacf91190 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 056ab1e9c5ff..2e374d9b4057 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 20410537d5b9..306ed0e61f36 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 4864c6d8de3c..5bf53723382e 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 6cac1d555ab0..5f56c3337029 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 2b892d3712f9..bd9527e8458b 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 1f472978e153..5c714d10a6a6 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 284364601aa4..3f5f6dece491 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 b17c7873a66f..3fc838474703 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 b559df0cb440..9dd424667447 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 bf0b1b75ea26..2291eba3513f 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 60973aea36a9..49ac81d04a93 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 030f34c7b329..4bdef0babf33 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 15c6ec115e29..86088d499ea5 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 6c117e6094bc..f7f43dc595bd 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 dfeb9653ba64..e169ab2d0f8b 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 9e0d475d4c3e..239cc1d2c048 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 74f33a28a25d..e8f15b400aed 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 d4d6cd0ba3aa..bfb6f107f52f 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 083e135d2420..2aefc2e14f28 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 e7390b094e60..2f0a54174fd5 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 cd86ea60c565..f6e89db44cc7 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 f0f50f7fe0ef..7ceaf1f087c9 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 bb849070e607..3669f2bfd7fa 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 f4b64fbe7a8d..ddafd9f64be2 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 4c90558b1cde..a1654f88de1b 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 71cf0ccb6c81..0c0d2a212395 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 1b510e81e4b3..c6075c4114b1 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 0b1d227b9090..2b46decfdbc3 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 c5dafd204006..52b6f744c88b 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 b91c9beefba0..e72cc3c279a2 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 23058f8bf98b..52044b8d2b4f 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 b94496118125..1ed02a2a07a8 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 5e7f3b2f4d2a..ceae4d399123 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 485a75ab447d..a154b0450dc9 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 7788265de276..00d271af5617 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 6e5d47da9319..92f64e677c19 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 db7b1ddd36a4..425f1320e5de 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 178dd0fb3269..45bddba7ce16 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 5dd6ffd76fcc..262b2aa7fd99 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 af0bdebc66ea..d23485649764 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 7580fceeeddc..a0438818a1c9 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 633f7766b1ce..2f2323e59f2f 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 4460056c2737..15c3415b3ad0 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 e96cbd36c038..7cf43ccf11e2 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 b480ef5ca530..718086576789 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 7e2b531b24bd..151a1d14ce3c 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 57a3b2027746..4abe2ca659f9 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 e68bdb7bbb5f..078fca29f1d1 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 92619c90e145..b52f5b0b997e 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 8c5395a45e4b..4efa8ea2c092 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 8c5f98db75b0..d4527c3b9f54 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 a2a3ac4bfa4a..c132cd4c6deb 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 0a84d35d82ad..f3cc7aab9671 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 898acfd67a94..606a27a87909 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 958a9fa6ed78..755c5ed2abc9 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 2608e21c59a1..f9479d458fe3 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 94c52d2e72f6..db1caa13b2c1 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 c26ce3ab46bc..2afc81d7dc99 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 285bc91a4d3d..d4ada384c423 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 b59df89bda54..12562ecdb325 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 a30a9476ab8f..d73c493a2a45 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 e7f9eea62421..d8885d37b653 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 cb90895230b2..f330f6bdd29c 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 11578dc12c7d..bfa1b0113aa3 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 ec0e797b77c4..8279f904e822 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 1081595aa724..295ecf5c9f0f 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 903fb25a5840..771e6cce7cfb 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 f6cfa50722f3..becc6c7026bc 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 f52ce5da00c4..2cf2fcb60c43 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 20c49d571b45..ea1e2d90bdb6 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 ca8bf1fd0b16..6c6a7c991ffb 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 e4967addde6f..f6e8370cf9c7 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 e301fbb21d2d..bfe5bef4a54d 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 c8c6997cf486..62d7f60b026b 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 261944b2f30e..1a8e1e3480e1 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 d0ab3c53a71c..0e0d550b42a7 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 cbd1911aef88..eca92ee8b3ca 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 a8cf5b2fcb5d..87c7f6def38f 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 e0454a2623a9..03a812ce1014 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 aaf2cb553771..8b1a2325053f 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 f74f0877c2dd..37cdfc5d6069 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 091617909608..b2897e7a3b17 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 e49507e4185d..f0add5402dd6 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 52de9901a874..57df8d8bebc1 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 5657e01638f0..8662a2bbc62c 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 1edff2d676b5..0ae052b00243 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 a14b5af93ad3..65311142a1e3 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 b90a90451a4b..7166f84132de 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 fa2240356812..4568dd341c9a 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 c8b5bd2c39fe..b0748631d750 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 c5f8514288fc..a3c4cc2060ce 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 356c111f62a2..ac7ea2a16bac 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 b151686c120b..4cbbe1a2120b 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 d81cdc7cf4c5..ee0d59caf579 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 b1310e0c2f7e..ac4a1fb07d99 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 155a5041de4b..90f1d23b03fa 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 b62f199140b3..4fe343231f53 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 b4f9b9bfa48e..d15a2b9520ad 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 90d05026631a..3816a3d8e66e 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 5ee13ccfa6b3..9647baf19400 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 4848cbfdbb97..e94dbf3e4560 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 7a8e51d6a553..94ef3ab6ef27 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 706774539866..743957ae1a34 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 35adc9066b0f..2c9fddf65ed7 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 0c7178376d42..1689723a36e5 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 323d9eb249b4..347595530300 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 51565445e31e..d2111b83ed8c 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 ce91ea257f23..19943107b86f 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 ff7263358a76..2f2e75661a0a 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 5bfd2a8ec031..862afaea30f3 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 d9a8c359268b..b4f1bf505d99 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 e503cb1b2816..82f6b06a57b6 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 7986a9f4ac7b..d29aaa6006e8 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 2e89311eb344..3ec2a1ef46dc 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 5fff68bcd6b4..52b1ddb3b124 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 5510a7d1402c..e2e3dffabe6d 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 b76d782d7c4c..2afbf503906c 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 041c1fca7f96..7be3f3e32a14 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 6aaa9baa2f84..698e6ba3d89b 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 50f8d8e2737d..f4e4570efaef 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 5206f71aceb4..94e68a19c276 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 65c422e960af..429e54db1723 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 d60bf4eceb78..0ce03e76a63b 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 5e232e8467bf..7242623599d8 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 15e79254b2c1..23be3638fb2a 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 99d943ff38ec..ea23b6fbd6b3 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 ebac81b25bc3..e29176476dbf 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 9a92c8d440e8..7c3addb820fe 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 63828abd4c72..d2e872bc3f83 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 2adac4f368ea..86db239306c2 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 25bf961acd03..f214998328be 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 d5f7e49a61d6..5779afb4f2b1 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 0b5b6bc51231..3467ab7f736b 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 3d851752cb90..b99fd1f3a59c 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 5b31f956415e..b9e00736b10d 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 c934cf3d240e..d34115e0f998 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 d6b072f94165..9adf32b8e539 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 1d525b61ecd7..7f59e422c429 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 b40ef967066f..e04ef285c523 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 d6d0266e2a04..ce4c3e4291b2 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 bcf43fd118af..1af4ecc299a0 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 ff5a4a87ea0b..9560955b16a9 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 4d473eb48ec5..f42038ae70d7 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 3b3bab4f3b1e..528de3606bfc 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 473528d30eb6..58adc902ba71 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 1a02ea599533..389b7df4e704 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 29a33e0685a8..2180233273a7 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 54fd8a9db1af..12dcd6058764 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 8568f51cef10..df7df3ec2e0d 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 bf2a22dae8ca..80e4d193cac5 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 4aa0f0f3dae4..5a71d2cd47d2 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 813d970ebe82..8b38f3e338b0 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 64466945b7c9..bb730147774a 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 e9b1c75ffcce..bd645570cbf0 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 5000e9b6a854..501447fd5c2c 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 d7f48611ac85..224a867f3653 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 f7ca65541f64..fcb7368ba5b9 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 93982889cf03..a2f8a0eeb275 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 b2ac37600f6b..3bd896a409e6 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 cb7ba85b0fc3..a8bfed436bd3 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 2bf4ff3e4302..c1e15db4c034 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 039746814c9d..0bfa6f879291 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 f6b45222742b..fddfb76ac76f 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 687b4714298a..5bc5eed0969e 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 dfda131f499f..78b8bf95e3fe 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 0782dbe41bfc..bd3ff5ae8101 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 ccab3da50b87..e8f9148924a3 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 61e835f51305..eaf58d79cc39 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 247735034324..9241ddd10358 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 fefa10743818..58b3bef6260b 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 c9dd5ab223b3..5b7161db4039 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 50c85b7ff76a..02811f468301 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 86e6278d2e6b..4c79c8ea34d7 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 69e561d02d66..cab0fb4e445a 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 1c9f91d96bf1..ecc8db446a8c 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 880efdbb7321..d73f6fdcc456 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 e21287159a9b..36e4ce174dc7 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 bcd3a99add52..bf5f08538741 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 662fecb217d3..69de2c923282 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 f85d1a54dfe4..7f5d11b6b01d 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 ec199afefe5a..562142c0277c 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 bd46b44e3910..a422d29761d7 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 326c6e3210a1..159eba71a168 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 788c0d3359d5..01994d443a9e 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 48fc2cbdb413..df00f371e5fa 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 2ce7fc675573..487a219231e7 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 6e6643d5f57d..a6f3a1504169 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 31214ecfb588..fbdcc2ac37cf 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 0a2b2b195947..2aad2206a5e9 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 93eda163388d..f656991f6c9a 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 f31a5261f794..ef6fba325666 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 f1f6c113b722..c8a0840dc30c 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 99b35efd9ba7..9e6f2f49e601 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 97a4d846d8d4..e13b7a1c3cc1 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 290475bd9aa6..78901dda7d1f 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 12dc33bd1c0a..dbc479dd20e1 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 db0e7f50bcaa..609e8312240b 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 50b0a9f9219d..597e6f3bb831 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 b080fb73e00d..504509b55e50 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 54c38668970f..d830b972096e 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 517e8afa22f5..59e43340cb05 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 927c96cc7b35..8b60ae091534 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 b16c7b1399b8..333b1c284215 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 b85c45beeb4b..93147a894da1 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 18c34ca75581..aa17dc78bd2e 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 4e827819fbb6..e316fd3dbf0f 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 b3f22289a717..39337ec61219 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 59e963c00979..d93f75b5aac3 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 d92d25ce5c06..b344cc0761f0 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 89fa9326496d..beeb84453018 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 7a656933a86f..6c45d17aba6b 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 64ff6ceb9c0f..a591a78edf71 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 370342f576ed..b901cab348e0 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 99e49716d526..81fea3ea29ba 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 b8c686a51b9b..7820c5c22b07 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 667433036bd9..6aae77d142fa 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 271195021c2a..0e3a69ff144c 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 2f5c9e7c3d6f..5d891b796193 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 8920c46bfed5..864f687f3cf3 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 243449518cd0..0923f811b913 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 6ff43dc1c85f..240c8a941942 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 5bc6ca5d88b6..362d094eba38 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 ed13ad44b4ab..68dfb79f46cc 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 e4662c14c7fc..e57c9cf54948 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 3d9874d51a66..19ffc0e8971d 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 6ca6235ba032..0981da016839 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 5d47dcdde0fd..15d3bc2e28fa 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 6492c032ee57..5c35648ae5c9 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 93de9e49a73a..843bee65cca5 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 399845d461ad..a96fe4dec1c8 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 fea34d667fde..c07b1afb559c 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 255aa492877b..921a67d153a5 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 810d89ffc14f..9ab3d5b387bc 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 1f6218b12e79..2cb9a44ea4fe 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 24dab9a36f72..b5f4215d111b 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 1a311be6b0c5..f4d703ee4c22 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 233a77905955..8e90248124a5 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 affc054dbb91..fe83cb23ffdc 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 1360e55fe987..b1541ba5d4d0 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 cbb82dbedd1e..58082fd2ad56 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 b80a97313daf..0e868c8db94c 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 a062d14a9354..10fe5e73a19c 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 c9394164c98d..28770c99562d 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 fc26615d81df..82364361781e 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 c7b6a74e1bb9..5ce3762eae72 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 edb1a01e3f49..6ea385da774a 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 49185f34e863..3b3b6318651f 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 5c9c8e560e59..60b82ec92630 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 b2bc314ac2de..4bc980d6654e 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 a806bd539c4b..c33ea76e400c 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 324f6b065eaa..327386cfa972 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 6ffe4726855b..a2e60c685508 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 25008c56c69d..3efd8bf586bd 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 b554e0f1350c..c863bbc616f3 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 73a4211e8e64..c3d8c26af5c6 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 80abdf929f88..0526fd508b5f 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 02c6200a8e00..77484b228a74 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 b6836b9aa7f2..811ac68f7485 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 e44e0e0fd060..cb8a35c86072 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 5d3ec428937f..e1bd47fd0cfc 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 da970a421072..8e0a589e9fa2 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 38b85eb4b073..71f0517c8ca3 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 bddd0d4d98b9..618147233ea9 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 10bd89fa838c..b5b73983f9b8 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 e32423cc090a..4562ce6a800a 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 e77c6bc4c453..13f49f091418 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 1243f70230c0..be2a38b04278 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 eea14cdd3626..a2d7536dc864 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 9b6b3b11e759..35b3ab803a9b 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 2166e233176c..c556bb254f75 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 8bda23e585dd..ff7408816b95 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 d8bffeb08caf..920cde1b8640 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 026ffbcafa67..439992baa312 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 8c3a5824f8f2..73c72419e72a 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 d7163c71b520..54da92245ba7 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 caf6e7df2214..0a15567a0dca 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 025b46356dcc..9adb813f597f 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 5b822d88e5cb..93c9d8f4cdd9 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 686ffa831b18..226058c6eb9e 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 a31aeb716245..ce8f84b3d94c 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 abafa14085f6..5a3d408332c2 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 e2ad828b280c..ca15309823e7 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 9e752a0b8b81..22303be785df 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 f4d9ff4d23a2..286ec0954957 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 8864b504ebaa..c2037ad1555d 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 88279c85b424..d61302999784 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 51b70431becc..00a11789ff86 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 8c88840ce7e2..68e525be3af5 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 7927c86c3ab1..13b6b29c3513 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 eab15796aa3c..69341aecdfe5 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 58be8fda8eac..7d4974ba1061 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 1a17e12eb23b..dfb1d428db98 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 6297bebc2dda..1d048e40ef89 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 84e4a77e6c28..2c261660b47e 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 6af8fa6e42a1..8dbbc72206e8 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 ed72bb19d0c7..794097a87053 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 fec68305cc89..aad09034cf34 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 3a123c8e6cf3..94feecd6ba70 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 a5733b7ca661..5904f6a11e7e 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 2a00c8a5953d..616a95a0abb6 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 5855f7bc031e..65a61e0988b4 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 92e19aa4fdc0..9ebf994b2421 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 02891dfb4370..8b243287f227 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 8ed4b4762160..050b4215319e 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
-- 
GitLab