From 58bc34aa1d29a8fb63eafe6f1d3af8e7a049de8b Mon Sep 17 00:00:00 2001
From: Susanne Moog <susanne.moog@typo3.com>
Date: Sat, 28 Jan 2017 10:24:15 +0100
Subject: [PATCH] [TASK] Testing Framework Extraction - Next Steps

- Removal of the CMS part from the namespace
- Distinguish Classes / Resources

For background information see

https://decisions.typo3.org/t/testing-framework-extraction-next-steps/50

Change-Id: I3f73baeb16bbef82c9626add063c9edde41b47a6
Resolves: #79518
Releases: master
Reviewed-on: https://review.typo3.org/51449
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
 .../Acceptance}/AcceptanceCoreEnvironment.php | 14 ++--
 .../Core}/Acceptance/Step/Backend/Admin.php   |  2 +-
 .../Core}/Acceptance/Step/Backend/Editor.php  |  2 +-
 .../FormHandlerElementTestDataObject.php      |  2 +-
 .../Acceptance/Support/Helper/Formhandler.php |  2 +-
 .../Acceptance/Support/Helper/ModalDialog.php |  2 +-
 .../Acceptance/Support/Helper/Topbar.php      |  2 +-
 .../Acceptance/Support/Page/PageTree.php      |  2 +-
 .../Core}/AccessibleObjectInterface.php       |  4 +-
 .../{core => Classes/Core}/BaseTestCase.php   |  8 +-
 .../{core => Classes/Core}/Exception.php      |  2 +-
 .../Core}/FileStreamWrapper.php               |  2 +-
 .../AbstractRecordConstraint.php              |  4 +-
 .../AbstractStructureRecordConstraint.php     |  2 +-
 .../DoesNotHaveRecordConstraint.php           |  4 +-
 .../RequestSection/HasRecordConstraint.php    |  4 +-
 .../StructureDoesNotHaveRecordConstraint.php  |  4 +-
 .../StructureHasRecordConstraint.php          |  4 +-
 .../Framework/Frontend/Collector.php          |  4 +-
 .../Frontend/Hook/BackendUserHandler.php      |  2 +-
 .../Frontend/Hook/FrontendUserHandler.php     |  2 +-
 .../Functional/Framework/Frontend/Parser.php  |  2 +-
 .../Framework/Frontend/Renderer.php           |  4 +-
 .../Framework/Frontend/RequestBootstrap.php   |  2 +-
 .../Framework/Frontend/Response.php           |  2 +-
 .../Framework/Frontend/ResponseContent.php    |  2 +-
 .../Framework/Frontend/ResponseSection.php    |  2 +-
 .../Core/Functional}/FunctionalTestCase.php   |  6 +-
 .../{core => Classes/Core}/Testbase.php       |  4 +-
 .../Core/Unit}/UnitTestCase.php               |  6 +-
 .../ViewHelpers/ViewHelperBaseTestcase.php    |  4 +-
 .../Core}/Acceptance/Fixtures/be_groups.xml   |  0
 .../Core}/Acceptance/Fixtures/be_sessions.xml |  0
 .../Core}/Acceptance/Fixtures/be_users.xml    |  0
 .../Acceptance/Fixtures/sys_category.xml      |  0
 ...xtensionmanager_domain_model_extension.xml |  0
 ...tensionmanager_domain_model_repository.xml |  0
 .../Core}/Build/AcceptanceTests.yml           |  2 +-
 .../Acceptance/Support/AcceptanceTester.php   |  0
 .../Acceptance/Support/Helper/Acceptance.php  |  0
 .../Build/Configuration/JSUnit/Bootstrap.js   |  0
 .../Build/Configuration/JSUnit/Helper.js      |  0
 .../Build/Configuration/JSUnit/karma.conf.js  |  6 +-
 .../Core}/Build/FunctionalTests.xml           |  4 +-
 .../Core}/Build/FunctionalTestsBootstrap.php  |  2 +-
 .../Build/Scripts/splitFunctionalTests.sh     | 50 ++++++------
 .../Core}/Build/UnitTests.xml                 |  6 +-
 .../Core}/Build/UnitTestsBootstrap.php        |  4 +-
 .../Core}/Functional/Fixtures/be_users.xml    |  0
 .../Core}/Functional/Fixtures/pages.xml       |  0
 .../Functional/Fixtures/sys_file_storage.xml  |  0
 .../Functional/Fixtures/sys_language.xml      |  0
 .../Core}/Functional/Fixtures/tt_content.xml  |  0
 .../compat/core/AccessibleObjectInterface.php |  2 +-
 .../compat/core/BaseTestCase.php              |  2 +-
 .../compat/core/Exception.php                 |  2 +-
 .../compat/core/FileStreamWrapper.php         |  2 +-
 .../compat/core/FunctionalTestCase.php        |  2 +-
 .../compat/core/Testbase.php                  |  2 +-
 .../compat/core/UnitTestCase.php              |  2 +-
 .../ViewHelpers/ViewHelperBaseTestcase.php    |  2 +-
 composer.json                                 |  3 +-
 .../Page/LocalizationControllerTest.php       |  4 +-
 .../ConditionMatcherTest.php                  |  2 +-
 .../Controller/EditDocumentControllerTest.php |  2 +-
 .../Controller/File/FileControllerTest.php    |  4 +-
 .../FormInlineAjaxControllerTest.php          |  2 +-
 .../FormSelectTreeAjaxControllerTest.php      |  2 +-
 .../Unit/Controller/LoginControllerTest.php   |  4 +-
 .../Controller/PageLayoutControllerTest.php   |  2 +-
 .../Wizard/SuggestWizardControllerTest.php    |  2 +-
 .../Form/Element/AbstractFormElementTest.php  |  4 +-
 .../Form/Element/InputDateTimeElementTest.php |  2 +-
 .../Form/Element/InputHiddenElementTest.php   |  2 +-
 .../Tests/Unit/Form/FormDataCompilerTest.php  |  2 +-
 .../FormDataGroup/FlexFormSegmentTest.php     |  2 +-
 .../FormDataGroup/InlineParentRecordTest.php  |  2 +-
 .../Unit/Form/FormDataGroup/OnTheFlyTest.php  |  2 +-
 .../FormDataGroup/OrderedProviderListTest.php |  2 +-
 .../FormDataGroup/TcaDatabaseRecordTest.php   |  2 +-
 .../TcaInputPlaceholderRecordTest.php         |  2 +-
 .../FormDataProvider/DatabaseEditRowTest.php  |  2 +-
 .../DatabaseEffectivePidTest.php              |  2 +-
 .../DatabaseLanguageRowsTest.php              |  2 +-
 .../DatabasePageLanguageOverlayRowsTest.php   |  2 +-
 .../DatabaseParentPageRowTest.php             |  2 +-
 .../DatabaseRecordOverrideValuesTest.php      |  2 +-
 .../DatabaseRecordTypeValueTest.php           |  2 +-
 .../DatabaseRowDateTimeFieldsTest.php         |  2 +-
 .../DatabaseRowDefaultValuesTest.php          |  2 +-
 .../DatabaseRowInitializeNewTest.php          |  2 +-
 .../DatabaseSystemLanguageRowsTest.php        |  2 +-
 .../DatabaseUniqueUidNewRowTest.php           |  2 +-
 .../DatabaseUserPermissionCheckTest.php       |  2 +-
 .../EvaluateDisplayConditionsTest.php         |  2 +-
 .../InitializeProcessedTcaTest.php            |  2 +-
 .../InlineOverrrideChildTcaTest.php           |  2 +-
 .../PageTsConfigMergedTest.php                |  2 +-
 .../FormDataProvider/ParentPageTcaTest.php    |  2 +-
 .../FormDataProvider/TcaCheckboxItemsTest.php |  2 +-
 .../TcaColumnsOverridesTest.php               |  2 +-
 .../TcaColumnsProcessCommonTest.php           |  2 +-
 .../TcaColumnsProcessFieldLabelsTest.php      |  2 +-
 .../TcaColumnsProcessPlaceholdersTest.php     |  2 +-
 .../TcaColumnsProcessRecordTitleTest.php      |  2 +-
 .../TcaColumnsProcessShowitemTest.php         |  2 +-
 .../TcaColumnsRemoveUnusedTest.php            |  2 +-
 .../FormDataProvider/TcaFlexPrepareTest.php   |  2 +-
 .../FormDataProvider/TcaFlexProcessTest.php   |  2 +-
 .../Form/FormDataProvider/TcaGroupTest.php    |  2 +-
 .../TcaInlineConfigurationTest.php            |  2 +-
 .../TcaInlineExpandCollapseStateTest.php      |  2 +-
 .../TcaInlineIsOnSymmetricSideTest.php        |  2 +-
 .../Form/FormDataProvider/TcaInlineTest.php   |  2 +-
 .../TcaInputPlaceholdersTest.php              |  2 +-
 .../FormDataProvider/TcaRadioItemsTest.php    |  2 +-
 .../FormDataProvider/TcaRecordTitleTest.php   |  2 +-
 .../FormDataProvider/TcaSelectItemsTest.php   |  2 +-
 .../TcaSelectTreeItemsTest.php                |  2 +-
 .../Form/FormDataProvider/TcaTextTest.php     |  2 +-
 .../FormDataProvider/TcaTypesShowitemTest.php |  2 +-
 .../FormDataProvider/UserTsConfigTest.php     |  2 +-
 .../Unit/Form/InlineStackProcessorTest.php    |  8 +-
 .../Tests/Unit/Form/NodeFactoryTest.php       |  2 +-
 .../Form/Utility/FormEngineUtilityTest.php    |  2 +-
 .../Unit/Form/Wizard/SuggestWizardTest.php    |  2 +-
 .../Tests/Unit/Module/ModuleLoaderTest.php    |  2 +-
 .../Button/FullyRenderedButtonTest.php        |  2 +-
 .../Components/Button/InputButtonTest.php     |  2 +-
 .../Components/Button/LinkButtonTest.php      |  2 +-
 .../Components/Button/SplitButtonTest.php     |  2 +-
 .../Template/Components/Menu/MenuItemTest.php |  2 +-
 .../Unit/Template/Components/MenuTest.php     |  2 +-
 .../Unit/Tree/Pagetree/DataProviderTest.php   |  2 +-
 .../Tree/SortedTreeNodeCollectionTest.php     |  2 +-
 .../Unit/Tree/TreeNodeCollectionTest.php      |  2 +-
 .../backend/Tests/Unit/Tree/TreeNodeTest.php  |  2 +-
 .../Tests/Unit/Utility/BackendUtilityTest.php |  4 +-
 .../BackendLayoutCollectionTest.php           |  2 +-
 .../View/BackendLayout/BackendLayoutTest.php  |  2 +-
 .../DataProviderCollectionTest.php            |  2 +-
 .../Tests/Unit/View/BackendLayoutViewTest.php |  2 +-
 .../Unit/Domain/Model/ConstraintTest.php      |  2 +-
 .../Tests/Unit/Domain/Model/LogEntryTest.php  |  2 +-
 .../Repository/HistoryEntryRepositoryTest.php |  4 +-
 .../Repository/LogEntryRepositoryTest.php     |  2 +-
 .../Repository/WorkspaceRepositoryTest.php    |  2 +-
 .../Unit/Domain/Model/BackendUserTest.php     |  2 +-
 .../Tests/Unit/Domain/Model/DemandTest.php    |  2 +-
 .../Repository/BackendUserRepositoryTest.php  |  2 +-
 .../BackendUserSessionRepositoryTest.php      |  2 +-
 .../Service/ModuleDataStorageServiceTest.php  |  2 +-
 ...-79025-ExtractTestingFrameworkForTYPO3.rst |  2 +-
 .../Backend/BackendUser/ListUserCest.php      |  2 +-
 .../Extensionmanager/GetExtensionsCest.php    |  2 +-
 .../InstalledExtensionsCest.php               |  2 +-
 .../Backend/Formhandler/CategoryTreeCest.php  |  2 +-
 .../Backend/Formhandler/ElementsBasicCest.php | 16 ++--
 .../Backend/Formhandler/ElementsGroupCest.php |  4 +-
 .../Backend/Formhandler/Inline1nCest.php      |  8 +-
 .../Backend/General/ModuleMenuCest.php        |  2 +-
 .../Backend/Install/InstallModuleCest.php     |  2 +-
 .../Backend/Language/LanguageCest.php         |  2 +-
 .../Backend/Login/BackendLoginCest.php        |  2 +-
 .../Backend/Page/AddPageInPageModuleCest.php  |  2 +-
 .../Backend/Page/PageModuleCest.php           |  2 +-
 .../Backend/Scheduler/TasksCest.php           |  4 +-
 .../Backend/Template/TemplateCest.php         |  2 +-
 .../Backend/Topbar/BookmarkCest.php           |  6 +-
 .../Acceptance/Backend/Topbar/FlushCest.php   |  4 +-
 .../Acceptance/Backend/Topbar/HelpCest.php    |  4 +-
 .../Acceptance/Backend/Topbar/LogoCest.php    |  2 +-
 .../Backend/Topbar/ModuleMenuButtonCest.php   |  2 +-
 .../Topbar/NavigationComponentTreeCest.php    |  2 +-
 .../Acceptance/Backend/Topbar/SearchCest.php  |  4 +-
 .../Backend/Topbar/UsernameOnAvatarCest.php   |  2 +-
 .../Backend/Typo3DatabaseBackendTest.php      |  2 +-
 .../Cache/Frontend/VariableFrontendTest.php   |  2 +-
 .../Collection/CategoryCollectionTest.php     |  2 +-
 .../RecordCollectionRepositoryTest.php        |  2 +-
 .../AbstractDataHandlerActionTestCase.php     | 18 ++---
 .../DataHandler/GetUniqueTest.php             |  2 +-
 .../FAL/AbstractActionTestCase.php            |  2 +-
 .../DataHandling/Framework/ActionService.php  |  4 +-
 .../Database/DatabaseConnectionTest.php       |  4 +-
 .../Database/PreparedStatementTest.php        |  2 +-
 .../Database/Schema/SchemaMigratorTest.php    |  2 +-
 .../Frontend/AdditionalConfiguration.php      |  4 +-
 .../Fixtures/Frontend/ExtbaseJsonRenderer.ts  |  2 +-
 .../Fixtures/Frontend/JsonRenderer.ts         | 10 +--
 .../Functional/Fixtures/Frontend/request.tpl  |  6 +-
 .../Log/Writer/DatabaseWriterTest.php         |  2 +-
 .../Messaging/FlashMessageQueueTest.php       |  2 +-
 .../Functional/Page/PageRendererTest.php      |  2 +-
 .../core/Tests/Functional/RegistryTest.php    |  2 +-
 .../Resource/ResourceStorageTest.php          | 14 ++--
 .../Tca/BackendGroupsVisibleFieldsTest.php    |  2 +-
 .../Tca/BackendUsersVisibleFieldsTest.php     |  2 +-
 .../Tca/CategoryVisibleFieldsTest.php         |  2 +-
 .../Tca/CollectionVisibleFieldsTest.php       |  2 +-
 .../Tca/FileCollectionVisibleFieldsTest.php   |  2 +-
 .../Tca/FileMetadataVisibleFieldsTest.php     |  2 +-
 .../Tca/FileStorageVisibleFieldsTest.php      |  2 +-
 .../Tca/FilemountsVisibleFieldsTest.php       |  2 +-
 .../Tca/LanguageVisibleFieldsTest.php         |  2 +-
 .../Functional/Tca/NewsVisibleFieldsTest.php  |  2 +-
 .../Functional/Tca/PagesVisibleFieldsTest.php |  2 +-
 .../Parser/TypoScriptParserTest.php           |  2 +-
 .../core/Tests/Integrity/IntegrityTest.php    |  2 +-
 .../typo3/contrib/class.removexssTest.php     |  2 +-
 .../AbstractUserAuthenticationTest.php        |  2 +-
 .../BackendUserAuthenticationTest.php         |  2 +-
 .../Cache/Backend/AbstractBackendTest.php     |  2 +-
 .../Unit/Cache/Backend/ApcBackendTest.php     |  4 +-
 .../Unit/Cache/Backend/ApcuBackendTest.php    |  4 +-
 .../Unit/Cache/Backend/FileBackendTest.php    |  2 +-
 .../Cache/Backend/MemcachedBackendTest.php    |  4 +-
 .../Unit/Cache/Backend/PdoBackendTest.php     |  2 +-
 .../Unit/Cache/Backend/RedisBackendTest.php   |  2 +-
 .../Backend/TransientMemoryBackendTest.php    |  2 +-
 .../Backend/Typo3DatabaseBackendTest.php      |  2 +-
 .../Cache/Backend/WincacheBackendTest.php     |  4 +-
 .../Tests/Unit/Cache/CacheFactoryTest.php     |  2 +-
 .../Tests/Unit/Cache/CacheManagerTest.php     | 10 +--
 .../Cache/Frontend/AbstractFrontendTest.php   |  2 +-
 .../Unit/Cache/Frontend/PhpFrontendTest.php   |  2 +-
 .../Cache/Frontend/StringFrontendTest.php     |  2 +-
 .../Cache/Frontend/VariableFrontendTest.php   |  2 +-
 .../Unit/Category/CategoryRegistryTest.php    |  2 +-
 .../Collection/CategoryCollectionTest.php     |  2 +-
 .../Unit/Charset/CharsetConverterTest.php     |  2 +-
 .../ConfigurationManagerTest.php              | 16 ++--
 .../FlexForm/FlexFormToolsTest.php            |  2 +-
 .../Loader/YamlFileLoaderTest.php             |  2 +-
 .../Tests/Unit/Configuration/RichtextTest.php |  2 +-
 .../AbstractConditionMatcherTest.php          |  2 +-
 .../Unit/Core/ApplicationContextTest.php      |  2 +-
 .../ClassLoadingInformationGeneratorTest.php  |  2 +-
 .../Core/SystemEnvironmentBuilderTest.php     |  4 +-
 .../core/Tests/Unit/Crypto/RandomTest.php     |  2 +-
 .../Unit/DataHandling/DataHandlerTest.php     |  4 +-
 .../Unit/Database/ConnectionPoolTest.php      |  2 +-
 .../Tests/Unit/Database/ConnectionTest.php    |  2 +-
 .../Unit/Database/DatabaseConnectionTest.php  |  4 +-
 .../Unit/Database/PreparedStatementTest.php   |  2 +-
 .../Unit/Database/Query/BulkInsertTest.php    |  2 +-
 .../Expression/ExpressionBuilderTest.php      |  2 +-
 .../Unit/Database/Query/QueryBuilderTest.php  |  2 +-
 .../Unit/Database/Query/QueryHelperTest.php   |  2 +-
 .../AbstractRestrictionTestCase.php           |  2 +-
 .../Unit/Database/RelationHandlerTest.php     |  2 +-
 .../Schema/ConnectionMigratorTest.php         |  2 +-
 .../SchemaColumnDefinitionListenerTest.php    |  2 +-
 .../Parser/AbstractDataTypeBaseTestCase.php   |  2 +-
 .../Parser/ColumnDefinitionAttributesTest.php |  2 +-
 .../Parser/ColumnDefinitionItemTest.php       |  2 +-
 .../Schema/Parser/CreateTableFragmentTest.php |  2 +-
 .../Parser/ForeignKeyDefinitionTest.php       |  2 +-
 .../Schema/Parser/IndexDefinitionTest.php     |  2 +-
 .../Schema/Parser/ReferenceDefinitionTest.php |  2 +-
 .../Schema/Parser/TableBuilderTest.php        |  2 +-
 .../Schema/Parser/TableOptionsTest.php        |  2 +-
 .../Unit/Database/Schema/SqlReaderTest.php    |  2 +-
 .../Database/Schema/Types/EnumTypeTest.php    |  2 +-
 .../Database/Schema/Types/SetTypeTest.php     |  2 +-
 .../Unit/Encoder/JavaScriptEncoderTest.php    |  2 +-
 .../Unit/Error/DebugExceptionHandlerTest.php  |  2 +-
 .../Error/ProductionExceptionHandlerTest.php  |  2 +-
 .../core/Tests/Unit/FileStreamWrapperTest.php |  4 +-
 .../AbstractFormProtectionTest.php            |  2 +-
 .../BackendFormProtectionTest.php             |  4 +-
 .../FormProtectionFactoryTest.php             |  2 +-
 .../InstallToolFormProtectionTest.php         |  4 +-
 .../core/Tests/Unit/Html/HtmlParserTest.php   |  2 +-
 .../Tests/Unit/Html/RteHtmlParserTest.php     |  2 +-
 .../core/Tests/Unit/Http/MessageTest.php      |  2 +-
 .../core/Tests/Unit/Http/RequestTest.php      |  2 +-
 .../core/Tests/Unit/Http/ResponseTest.php     |  2 +-
 .../Unit/Http/ServerRequestFactoryTest.php    |  2 +-
 .../Tests/Unit/Http/ServerRequestTest.php     |  2 +-
 .../core/Tests/Unit/Http/StreamTest.php       |  2 +-
 .../core/Tests/Unit/Http/UploadedFileTest.php |  2 +-
 typo3/sysext/core/Tests/Unit/Http/UriTest.php |  2 +-
 .../core/Tests/Unit/Imaging/DimensionTest.php |  2 +-
 .../Unit/Imaging/GraphicalFunctionsTest.php   |  2 +-
 .../Tests/Unit/Imaging/IconFactoryTest.php    |  2 +-
 .../IconProvider/BitmapIconProviderTest.php   |  2 +-
 .../FontawesomeIconProviderTest.php           |  2 +-
 .../IconProvider/SvgIconProviderTest.php      |  2 +-
 .../Tests/Unit/Imaging/IconRegistryTest.php   |  2 +-
 .../core/Tests/Unit/Imaging/IconTest.php      |  2 +-
 .../LinkHandling/EmailLinkHandlerTest.php     |  2 +-
 .../Unit/LinkHandling/FileLinkHandlerTest.php |  4 +-
 .../LinkHandling/FolderLinkHandlerTest.php    |  4 +-
 .../LegacyLinkNotationConverterTest.php       |  4 +-
 .../Unit/LinkHandling/LinkServiceTest.php     |  2 +-
 .../Unit/LinkHandling/PageLinkHandlerTest.php |  2 +-
 .../Unit/LinkHandling/UrlLinkHandlerTest.php  |  2 +-
 .../Tests/Unit/Localization/LocalesTest.php   |  2 +-
 .../Localization/LocalizationFactoryTest.php  |  2 +-
 .../Parser/LocallangXmlParserTest.php         |  2 +-
 .../Localization/Parser/XliffParserTest.php   |  2 +-
 .../Unit/Locking/FileLockStrategyTest.php     |  2 +-
 .../Tests/Unit/Locking/LockFactoryTest.php    |  4 +-
 .../Locking/SemaphoreLockStrategyTest.php     |  2 +-
 .../Unit/Locking/SimpleLockStrategyTest.php   |  8 +-
 .../core/Tests/Unit/Log/LogLevelTest.php      |  2 +-
 .../core/Tests/Unit/Log/LogManagerTest.php    |  2 +-
 .../core/Tests/Unit/Log/LogRecordTest.php     |  2 +-
 .../sysext/core/Tests/Unit/Log/LoggerTest.php |  2 +-
 .../Unit/Log/Processor/AbstractMemoryTest.php |  2 +-
 .../Log/Processor/AbstractProcessorTest.php   |  2 +-
 .../Processor/IntrospectionProcessorTest.php  |  2 +-
 .../MemoryPeakUsageProcessorTest.php          |  2 +-
 .../Processor/MemoryUsageProcessorTest.php    |  2 +-
 .../Unit/Log/Processor/WebProcessorTest.php   |  2 +-
 .../Unit/Log/Writer/AbstractWriterTest.php    |  2 +-
 .../Unit/Log/Writer/DatabaseWriterTest.php    |  2 +-
 .../Tests/Unit/Log/Writer/FileWriterTest.php  |  2 +-
 .../core/Tests/Unit/Mail/MailMessageTest.php  |  2 +-
 .../core/Tests/Unit/Mail/MailerTest.php       |  2 +-
 .../FlashMessageRendererResolverTest.php      |  2 +-
 .../Messaging/FlashMessageServiceTest.php     |  4 +-
 .../Renderer/BootstrapRendererTest.php        |  2 +-
 .../Messaging/Renderer/ListRendererTest.php   |  2 +-
 .../Renderer/PlaintextRendererTest.php        |  2 +-
 .../Unit/Migrations/TcaMigrationTest.php      |  2 +-
 .../Unit/Package/DependencyResolverTest.php   |  8 +-
 .../Tests/Unit/Package/PackageManagerTest.php |  8 +-
 .../core/Tests/Unit/Package/PackageTest.php   |  2 +-
 .../core/Tests/Unit/Page/PageRendererTest.php | 22 ++---
 typo3/sysext/core/Tests/Unit/RegistryTest.php |  2 +-
 .../Tests/Unit/Resource/AbstractFileTest.php  |  2 +-
 .../core/Tests/Unit/Resource/BaseTestCase.php |  2 +-
 ...stractHierarchicalFilesystemDriverTest.php |  2 +-
 .../Resource/Driver/DriverRegistryTest.php    |  2 +-
 .../Unit/Resource/Driver/LocalDriverTest.php  |  6 +-
 .../Tests/Unit/Resource/FileReferenceTest.php |  4 +-
 .../core/Tests/Unit/Resource/FileTest.php     |  2 +-
 .../Resource/Filter/FileNameFilterTest.php    |  2 +-
 .../core/Tests/Unit/Resource/FolderTest.php   |  2 +-
 .../Resource/Index/ExtractorRegistryTest.php  |  2 +-
 .../Tests/Unit/Resource/Index/IndexerTest.php |  2 +-
 .../Tests/Unit/Resource/ProcessedFileTest.php |  2 +-
 .../Processing/LocalPreviewHelperTest.php     |  2 +-
 .../Rendering/AudioTagRendererTest.php        |  2 +-
 .../Rendering/RendererRegistryTest.php        |  2 +-
 .../Rendering/VideoTagRendererTest.php        |  2 +-
 .../Resource/Rendering/VimeoRendererTest.php  |  2 +-
 .../Rendering/YouTubeRendererTest.php         |  2 +-
 .../Repository/AbstractRepositoryTest.php     |  2 +-
 .../Unit/Resource/ResourceCompressorTest.php  |  2 +-
 .../Unit/Resource/ResourceFactoryTest.php     |  6 +-
 .../Unit/Resource/ResourceStorageTest.php     |  2 +-
 .../TextExtraction/PlainTextExtractorTest.php |  2 +-
 .../TextExtractorRegistryTest.php             |  2 +-
 .../Utility/FileExtensionFilterTest.php       |  2 +-
 .../Service/DependencyOrderingServiceTest.php |  6 +-
 .../MarkerBasedTemplateServiceTest.php        |  2 +-
 .../DatabaseTreeDataProviderTest.php          |  6 +-
 .../TreeDataProviderFactoryTest.php           |  2 +-
 .../core/Tests/Unit/Type/EnumerationTest.php  |  2 +-
 .../Tests/Unit/Type/File/FileInfoTest.php     |  2 +-
 .../Tests/Unit/Type/File/ImageInfoTest.php    |  2 +-
 .../Parser/TypoScriptParserTest.php           |  4 +-
 .../Unit/TypoScript/TemplateServiceTest.php   |  4 +-
 .../Tests/Unit/Utility/ArrayUtilityTest.php   |  2 +-
 .../Unit/Utility/ClassNamingUtilityTest.php   |  2 +-
 .../Tests/Unit/Utility/ClientUtilityTest.php  |  2 +-
 .../Tests/Unit/Utility/CommandUtilityTest.php |  2 +-
 .../Tests/Unit/Utility/CsvUtilityTest.php     |  2 +-
 .../Tests/Unit/Utility/DebugUtilityTest.php   |  2 +-
 .../ExtensionManagementUtilityTest.php        |  2 +-
 .../Utility/File/ExtendedFileUtilityTest.php  |  2 +-
 .../Tests/Unit/Utility/GeneralUtilityTest.php |  4 +-
 .../Tests/Unit/Utility/HttpUtilityTest.php    |  2 +-
 .../Tests/Unit/Utility/MailUtilityTest.php    |  2 +-
 .../Tests/Unit/Utility/MathUtilityTest.php    |  2 +-
 .../Tests/Unit/Utility/PathUtilityTest.php    |  2 +-
 .../Unit/Utility/ResourceUtilityTest.php      |  2 +-
 .../Unit/Utility/RootlineUtilityTest.php      |  4 +-
 .../Tests/Unit/Utility/StringUtilityTest.php  |  2 +-
 .../Unit/Utility/VersionNumberUtilityTest.php |  2 +-
 .../IconForRecordViewHelperTest.php           |  2 +-
 .../Unit/ViewHelpers/IconViewHelperTest.php   |  2 +-
 .../Tca/ContentVisibleFieldsTest.php          |  2 +-
 .../Unit/Domain/Model/DocumentFormatTest.php  |  2 +-
 .../Tests/Unit/Domain/Model/DocumentTest.php  |  2 +-
 .../Domain/Model/DocumentTranslationTest.php  |  2 +-
 .../BackendConfigurationManagerTest.php       |  2 +-
 .../Tests/Functional/Persistence/AddTest.php  |  2 +-
 .../Functional/Persistence/CountTest.php      |  4 +-
 .../Persistence/EnableFieldsTest.php          |  2 +-
 .../Fixtures/Frontend/JsonRenderer.ts         |  4 +-
 .../Generic/Mapper/DataMapperTest.php         |  2 +-
 .../Tests/Functional/Persistence/InTest.php   |  4 +-
 .../Functional/Persistence/OperatorTest.php   |  4 +-
 .../Persistence/QueryParserTest.php           |  2 +-
 .../Functional/Persistence/RelationTest.php   |  4 +-
 .../Persistence/TranslationTest.php           |  4 +-
 .../AbstractConfigurationManagerTest.php      | 12 +--
 .../BackendConfigurationManagerTest.php       |  6 +-
 .../FrontendConfigurationManagerTest.php      |  8 +-
 .../extbase/Tests/Unit/Core/BootstrapTest.php |  6 +-
 .../Domain/Model/BackendUserGroupTest.php     |  2 +-
 .../Unit/Domain/Model/BackendUserTest.php     |  2 +-
 .../Tests/Unit/Domain/Model/CategoryTest.php  |  2 +-
 .../Tests/Unit/Domain/Model/FileMountTest.php |  2 +-
 .../Domain/Model/FrontendUserGroupTest.php    |  2 +-
 .../Unit/Domain/Model/FrontendUserTest.php    |  2 +-
 .../BackendUserGroupRepositoryTest.php        |  2 +-
 .../Repository/BackendUserRepositoryTest.php  |  2 +-
 .../Repository/CategoryRepositoryTest.php     |  2 +-
 .../Repository/FileMountRepositoryTest.php    |  2 +-
 .../Unit/DomainObject/AbstractEntityTest.php  |  2 +-
 .../extbase/Tests/Unit/Error/ErrorTest.php    |  2 +-
 .../extbase/Tests/Unit/Error/MessageTest.php  |  2 +-
 .../extbase/Tests/Unit/Error/ResultTest.php   |  2 +-
 .../DataHandler/CheckFlexFormValueTest.php    |  2 +-
 .../Tests/Unit/Mvc/Cli/CommandManagerTest.php |  4 +-
 .../Tests/Unit/Mvc/Cli/CommandTest.php        |  4 +-
 .../Tests/Unit/Mvc/Cli/RequestBuilderTest.php |  6 +-
 .../Tests/Unit/Mvc/Cli/RequestTest.php        |  4 +-
 .../Mvc/Controller/AbstractControllerTest.php |  2 +-
 .../Mvc/Controller/ActionControllerTest.php   | 16 ++--
 .../Unit/Mvc/Controller/ArgumentTest.php      |  2 +-
 .../Unit/Mvc/Controller/ArgumentsTest.php     |  2 +-
 .../Mvc/Controller/CommandControllerTest.php  |  4 +-
 ...ropertyMappingConfigurationServiceTest.php |  2 +-
 .../extbase/Tests/Unit/Mvc/RequestTest.php    |  2 +-
 .../extbase/Tests/Unit/Mvc/ResponseTest.php   |  4 +-
 .../Tests/Unit/Mvc/View/JsonViewTest.php      |  2 +-
 .../Unit/Mvc/Web/CacheHashEnforcerTest.php    |  2 +-
 .../Tests/Unit/Mvc/Web/RequestBuilderTest.php |  4 +-
 .../Unit/Mvc/Web/Routing/UriBuilderTest.php   | 12 +--
 .../Object/Container/ClassInfoFactoryTest.php |  2 +-
 .../Unit/Object/Container/ContainerTest.php   |  2 +-
 .../Unit/Persistence/Generic/BackendTest.php  |  4 +-
 .../Generic/Mapper/DataMapFactoryTest.php     |  4 +-
 .../Generic/Mapper/DataMapperTest.php         |  4 +-
 .../Generic/PersistenceManagerTest.php        |  4 +-
 .../Persistence/Generic/QueryFactoryTest.php  |  2 +-
 .../Persistence/Generic/QueryResultTest.php   |  4 +-
 .../Unit/Persistence/Generic/QueryTest.php    |  2 +-
 .../Unit/Persistence/Generic/SessionTest.php  |  2 +-
 .../Generic/Storage/Typo3DbBackendTest.php    |  2 +-
 .../Storage/Typo3DbQueryParserTest.php        |  2 +-
 .../Generic/Typo3QuerySettingsTest.php        |  2 +-
 .../Unit/Persistence/ObjectStorageTest.php    |  2 +-
 .../Tests/Unit/Persistence/RepositoryTest.php |  4 +-
 .../Unit/Property/PropertyMapperTest.php      | 10 +--
 ...ropertyMappingConfigurationBuilderTest.php |  2 +-
 .../PropertyMappingConfigurationTest.php      |  2 +-
 .../TypeConverter/ArrayConverterTest.php      |  2 +-
 .../TypeConverter/BooleanConverterTest.php    |  2 +-
 .../TypeConverter/DateTimeConverterTest.php   |  2 +-
 .../TypeConverter/FloatConverterTest.php      |  2 +-
 .../TypeConverter/IntegerConverterTest.php    |  2 +-
 .../TypeConverter/ObjectConverterTest.php     |  2 +-
 .../PersistentObjectConverterTest.php         |  2 +-
 .../TypeConverter/StringConverterTest.php     |  2 +-
 .../Tests/Unit/Reflection/ClassSchemaTest.php |  2 +-
 .../Unit/Reflection/DocCommentParserTest.php  |  2 +-
 .../Unit/Reflection/ObjectAccessTest.php      |  2 +-
 .../Unit/Reflection/ReflectionServiceTest.php |  2 +-
 .../Unit/Scheduler/FieldProviderTest.php      | 22 ++---
 .../extbase/Tests/Unit/Scheduler/TaskTest.php |  4 +-
 .../Security/Cryptography/HashServiceTest.php |  2 +-
 .../Tests/Unit/Service/CacheServiceTest.php   |  2 +-
 .../Unit/Service/ExtensionServiceTest.php     |  2 +-
 .../Unit/Service/FlexFormServiceTest.php      |  2 +-
 .../Unit/Service/ImageScriptServiceTest.php   |  2 +-
 .../Unit/Service/TypoScriptServiceTest.php    |  2 +-
 .../Tests/Unit/SignalSlot/DispatcherTest.php  |  4 +-
 .../Tests/Unit/Utility/ArrayUtilityTest.php   |  2 +-
 .../Unit/Utility/DebuggerUtilityTest.php      |  2 +-
 .../Unit/Utility/ExtensionUtilityTest.php     |  2 +-
 .../Unit/Utility/LocalizationUtilityTest.php  |  2 +-
 .../AbstractCompositeValidatorTest.php        |  2 +-
 .../Validator/AbstractValidatorTest.php       |  2 +-
 .../Validator/AbstractValidatorTestcase.php   |  2 +-
 .../Validator/AlphanumericValidatorTest.php   |  2 +-
 .../Validator/CollectionValidatorTest.php     |  4 +-
 .../Validator/ConjunctionValidatorTest.php    |  4 +-
 .../Validator/DisjunctionValidatorTest.php    |  2 +-
 .../Validator/EmailAddressValidatorTest.php   |  2 +-
 .../Validator/NumberRangeValidatorTest.php    |  2 +-
 .../Validator/NumberValidatorTest.php         |  2 +-
 .../RegularExpressionValidatorTest.php        |  2 +-
 .../Validator/StringLengthValidatorTest.php   |  2 +-
 .../Unit/Validation/ValidatorResolverTest.php |  4 +-
 .../Controller/DownloadControllerTest.php     |  2 +-
 .../UpdateFromTerControllerTest.php           |  4 +-
 .../UploadExtensionFileControllerTest.php     |  2 +-
 .../Unit/Domain/Model/DownloadQueueTest.php   |  4 +-
 .../Tests/Unit/Domain/Model/ExtensionTest.php |  2 +-
 .../ConfigurationItemRepositoryTest.php       |  4 +-
 .../Repository/RepositoryRepositoryTest.php   |  2 +-
 .../Tests/Unit/Report/ExtensionStatusTest.php | 24 +++---
 .../ExtensionManagementServiceTest.php        |  2 +-
 .../Unit/Task/UpdateExtensionListTaskTest.php |  2 +-
 .../Unit/Utility/ConfigurationUtilityTest.php | 10 +--
 .../Unit/Utility/DependencyUtilityTest.php    |  2 +-
 .../Tests/Unit/Utility/EmConfUtilityTest.php  |  2 +-
 .../Utility/ExtensionModelUtilityTest.php     |  2 +-
 .../Unit/Utility/FileHandlingUtilityTest.php  |  2 +-
 .../Tests/Unit/Utility/InstallUtilityTest.php |  4 +-
 .../Tests/Unit/Utility/ListUtilityTest.php    |  2 +-
 .../Tca/ContentVisibleFieldsTest.php          |  2 +-
 .../FrontendLoginControllerTest.php           |  4 +-
 .../Tca/FileMetadataVisibleFieldsTest.php     |  2 +-
 .../EscapeChildrenRenderingStandaloneTest.php |  2 +-
 .../EscapeChildrenRenderingTest.php           |  2 +-
 .../Core/Cache/FluidTemplateCacheTest.php     |  2 +-
 ...XmlnsNamespaceTemplatePreProcessorTest.php |  2 +-
 .../LegacyNamespaceExpressionNodeTest.php     |  2 +-
 .../Core/Rendering/RenderingContextTest.php   |  2 +-
 .../Variables/CmsVariableProviderTest.php     |  2 +-
 .../ViewHelper/AbstractViewHelperTest.php     |  2 +-
 .../ViewHelper/ArgumentDefinitionTest.php     |  2 +-
 .../ViewHelper/ViewHelperResolverTest.php     |  2 +-
 .../Widget/AbstractWidgetControllerTest.php   |  4 +-
 .../Widget/AbstractWidgetViewHelperTest.php   |  2 +-
 .../Widget/AjaxWidgetContextHolderTest.php    |  2 +-
 .../Unit/Core/Widget/WidgetContextTest.php    |  2 +-
 .../Core/Widget/WidgetRequestBuilderTest.php  |  2 +-
 .../Core/Widget/WidgetRequestHandlerTest.php  |  2 +-
 .../Unit/Core/Widget/WidgetRequestTest.php    |  2 +-
 .../Unit/View/AbstractTemplateViewTest.php    |  4 +-
 .../Tests/Unit/View/StandaloneViewTest.php    |  4 +-
 .../Tests/Unit/View/TemplatePathsTest.php     |  2 +-
 .../Unit/ViewHelpers/BaseViewHelperTest.php   |  2 +-
 .../IfAuthenticatedViewHelperTest.php         |  2 +-
 .../Be/Security/IfHasRoleViewHelperTest.php   |  2 +-
 .../ViewHelpers/CObjectViewHelperTest.php     |  2 +-
 .../FlashMessagesViewHelperTest.php           |  2 +-
 .../Form/AbstractFormViewHelperTest.php       |  2 +-
 .../ViewHelpers/Form/ButtonViewHelperTest.php |  2 +-
 .../Form/CheckboxViewHelperTest.php           |  2 +-
 .../Form/FormFieldViewHelperBaseTestcase.php  |  2 +-
 .../ViewHelpers/Form/RadioViewHelperTest.php  |  2 +-
 .../ViewHelpers/Form/SelectViewHelperTest.php |  2 +-
 .../Form/TextfieldViewHelperTest.php          |  2 +-
 .../ViewHelpers/Form/UploadViewHelperTest.php |  2 +-
 .../Unit/ViewHelpers/FormViewHelperTest.php   |  2 +-
 .../Format/BytesViewHelperTest.php            |  2 +-
 .../ViewHelpers/Format/CaseViewHelperTest.php |  2 +-
 .../ViewHelpers/Format/CropViewHelperTest.php |  2 +-
 .../Format/CurrencyViewHelperTest.php         |  2 +-
 .../ViewHelpers/Format/DateViewHelperTest.php |  4 +-
 .../HtmlentitiesDecodeViewHelperTest.php      |  2 +-
 .../Format/HtmlentitiesViewHelperTest.php     |  2 +-
 .../Format/Nl2brViewHelperTest.php            |  2 +-
 .../Format/NumberViewHelperTest.php           |  2 +-
 .../Format/PaddingViewHelperTest.php          |  2 +-
 .../Format/StripTagsViewHelperTest.php        |  2 +-
 .../Format/UrlencodeViewHelperTest.php        |  2 +-
 .../Unit/ViewHelpers/ImageViewHelperTest.php  |  2 +-
 .../ViewHelpers/Link/EmailViewHelperTest.php  |  2 +-
 .../Link/ExternalViewHelperTest.php           |  2 +-
 .../ViewHelpers/Link/PageViewHelperTest.php   |  2 +-
 .../Link/TypolinkViewHelperTest.php           |  4 +-
 .../IfAuthenticatedViewHelperTest.php         |  2 +-
 .../Security/IfHasRoleViewHelperTest.php      |  2 +-
 .../ViewHelpers/TranslateViewHelperTest.php   |  2 +-
 .../ViewHelpers/Uri/EmailViewHelperTest.php   |  2 +-
 .../Uri/ExternalViewHelperTest.php            |  2 +-
 .../ViewHelpers/Uri/PageViewHelperTest.php    |  2 +-
 .../Uri/TypolinkViewHelperTest.php            |  4 +-
 .../Controller/PaginateControllerTest.php     |  4 +-
 .../Tca/ContentVisibleFieldsTest.php          |  2 +-
 .../AbstractBackendControllerTest.php         |  2 +-
 .../Controller/FormEditorControllerTest.php   |  2 +-
 .../Controller/FormFrontendControllerTest.php |  2 +-
 .../Controller/FormManagerControllerTest.php  |  2 +-
 .../ConfigurationServiceTest.php              |  2 +-
 .../Domain/Finishers/AbstractFinisherTest.php |  2 +-
 .../FormElements/AbstractSectionTest.php      |  2 +-
 .../Unit/Domain/Runtime/FormRuntimeTest.php   |  2 +-
 .../Hooks/DataStructureIdentifierHookTest.php |  2 +-
 .../InheritancesResolverServiceTest.php       |  2 +-
 .../Configuration/TypoScriptServiceTest.php   |  2 +-
 .../Unit/Mvc/Configuration/YamlSourceTest.php |  2 +-
 .../FormPersistenceManagerTest.php            |  2 +-
 .../Tests/Unit/Mvc/ProcessingRuleTest.php     |  2 +-
 .../Mvc/Validation/CountValidatorTest.php     |  2 +-
 .../Mvc/Validation/EmptyValidatorTest.php     |  2 +-
 .../Mvc/Validation/MimeTypeValidatorTest.php  |  2 +-
 .../Unit/Service/TranslationServiceTest.php   |  2 +-
 .../Form/DatePickerViewHelperTest.php         |  2 +-
 .../ContentObjectRendererTest.php             |  2 +-
 .../FluidTemplateContentObjectTest.php        |  2 +-
 .../TypoScriptFrontendControllerTest.php      |  2 +-
 .../Functional/Page/PageRepositoryTest.php    |  2 +-
 .../Tca/BackendLayoutVisibleFieldsTest.php    |  2 +-
 .../Tca/ContentVisibleFieldsTest.php          |  2 +-
 .../Tca/DomainVisibleFieldsTest.php           |  2 +-
 .../Tca/FrontendGroupsVisibleFieldsTest.php   |  2 +-
 .../Tca/FrontendUsersVisibleFieldsTest.php    |  2 +-
 .../PagesLanguageOverlayVisibleFieldsTest.php |  2 +-
 .../Tca/TemplateVisibleFieldsTest.php         |  2 +-
 .../ConditionMatcherTest.php                  |  2 +-
 .../ContentObject/CaseContentObjectTest.php   |  2 +-
 .../ContentDataProcessorTest.php              |  2 +-
 .../ContentObjectRendererTest.php             |  6 +-
 .../ContentObject/FilesContentObjectTest.php  |  2 +-
 .../FluidTemplateContentObjectTest.php        |  4 +-
 .../Menu/AbstractMenuContentObjectTest.php    |  2 +-
 .../Menu/MenuContentObjectFactoryTest.php     |  2 +-
 .../TypoScriptFrontendControllerTest.php      |  4 +-
 .../Unit/Page/CacheHashCalculatorTest.php     |  2 +-
 .../Tests/Unit/Page/PageGeneratorTest.php     |  2 +-
 .../Tests/Unit/Page/PageRepositoryTest.php    |  4 +-
 .../Tests/Unit/Plugin/AbstractPluginTest.php  |  2 +-
 .../Unit/Processor/GalleryProcessorTest.php   |  2 +-
 .../Unit/Service/TypoLinkCodecServiceTest.php |  2 +-
 .../Tests/Unit/View/AdminPanelViewTest.php    |  2 +-
 .../Export/AbstractExportTestCase.php         |  2 +-
 .../Tca/IndexConfigVisibleFieldsTest.php      |  2 +-
 .../Functional/Utility/LikeWildcardTest.php   |  2 +-
 .../indexed_search/Tests/Unit/IndexerTest.php |  2 +-
 .../SqlSchemaMigrationServiceTest.php         |  2 +-
 .../Ajax/ExtensionCompatibilityTesterTest.php |  2 +-
 .../Unit/FolderStructure/AbstractNodeTest.php | 44 +++++-----
 .../FolderStructure/DefaultFactoryTest.php    |  2 +-
 .../FolderStructure/DirectoryNodeTest.php     | 64 +++++++--------
 .../Unit/FolderStructure/FileNodeTest.php     | 80 +++++++++----------
 .../Unit/FolderStructure/LinkNodeTest.php     | 44 +++++-----
 .../Unit/FolderStructure/RootNodeTest.php     | 24 +++---
 .../FolderStructure/StructureFacadeTest.php   |  6 +-
 .../Tests/Unit/FolderStructureTestCase.php    |  2 +-
 .../Unit/Service/CoreUpdateServiceTest.php    | 12 +--
 .../Unit/Service/CoreVersionServiceTest.php   | 42 +++++-----
 .../Unit/Service/EnableFileServiceTest.php    |  6 +-
 .../SilentConfigurationUpgradeServiceTest.php | 22 ++---
 .../Service/SqlSchemaMigrationServiceTest.php |  6 +-
 .../Tests/Unit/Status/StatusUtilityTest.php   |  2 +-
 .../UpgradeAnalysis/DocumentationFileTest.php |  2 +-
 .../install/Tests/Unit/View/JsonViewTest.php  |  2 +-
 .../Format/PhpErrorCodeViewHelperTest.php     |  2 +-
 .../Tests/Unit/Domain/Model/ExtensionTest.php |  2 +-
 .../Tests/Unit/Domain/Model/LanguageTest.php  |  2 +-
 .../Tests/Unit/Utility/ArrayBrowserTest.php   |  2 +-
 .../AbstractDatabaseRecordListTest.php        |  4 +-
 .../Recycle/AbstractRecycleTestCase.php       |  2 +-
 .../Unit/Task/CleanerFieldProviderTest.php    |  2 +-
 .../Tests/Unit/Task/CleanerTaskTest.php       |  2 +-
 .../Unit/Report/Status/Typo3StatusTest.php    |  2 +-
 .../Functional/Storage/SplitStorageTest.php   |  2 +-
 .../Unit/Backend/CommandLineBackendTest.php   |  2 +-
 .../Tests/Unit/Backend/PhpBackendTest.php     |  2 +-
 .../sysext/rsaauth/Tests/Unit/KeypairTest.php |  2 +-
 .../Tca/AcronymVisibleFieldsTest.php          |  2 +-
 .../Functional/SaltedPasswordServiceTest.php  |  2 +-
 .../Functional/Task/BulkUpdateTaskTest.php    |  2 +-
 .../Utility/SaltedPasswordsUtilityTest.php    |  2 +-
 .../Tests/Unit/Evaluation/EvaluatorTest.php   |  2 +-
 .../Tests/Unit/Salt/BlowfishSaltTest.php      |  2 +-
 .../Tests/Unit/Salt/Md5SaltTest.php           |  2 +-
 .../Tests/Unit/Salt/Pbkdf2SaltTest.php        |  2 +-
 .../Tests/Unit/Salt/PhpassSaltTest.php        |  2 +-
 .../Tests/Unit/Salt/SaltFactoryTest.php       |  2 +-
 .../Utility/SaltedPasswordsUtilityTest.php    |  2 +-
 .../Tca/TaskGroupVisibleFieldsTest.php        |  2 +-
 .../Unit/CronCommand/CronCommandTest.php      |  2 +-
 .../Unit/CronCommand/NormalizeCommandTest.php |  2 +-
 .../CachingFrameworkGarbageCollectionTest.php |  2 +-
 .../Tests/Unit/SetupModuleControllerTest.php  |  2 +-
 .../Functional/AuthenticationServiceTest.php  |  2 +-
 .../Tests/Unit/AuthenticationServiceTest.php  |  2 +-
 .../Unit/Report/ServicesListReportTest.php    |  2 +-
 .../Tca/ActionVisibleFieldsTest.php           |  2 +-
 .../Functional/Tca/NoteVisibleFieldsTest.php  |  2 +-
 .../ActionHandler/ActionHandlerTest.php       |  2 +-
 .../Service/WorkspaceServiceTest.php          | 12 +--
 .../Tca/WorkspaceStageVisibleFieldsTest.php   |  2 +-
 .../Tca/WorkspaceVisibleFieldsTest.php        |  2 +-
 .../Controller/Remote/RemoteServerTest.php    |  2 +-
 678 files changed, 1088 insertions(+), 1089 deletions(-)
 rename components/testing_framework/{core => Classes/Core/Acceptance}/AcceptanceCoreEnvironment.php (94%)
 rename components/testing_framework/{core => Classes/Core}/Acceptance/Step/Backend/Admin.php (90%)
 rename components/testing_framework/{core => Classes/Core}/Acceptance/Step/Backend/Editor.php (90%)
 rename components/testing_framework/{core => Classes/Core}/Acceptance/Support/Helper/FormHandlerElementTestDataObject.php (96%)
 rename components/testing_framework/{core => Classes/Core}/Acceptance/Support/Helper/Formhandler.php (98%)
 rename components/testing_framework/{core => Classes/Core}/Acceptance/Support/Helper/ModalDialog.php (96%)
 rename components/testing_framework/{core => Classes/Core}/Acceptance/Support/Helper/Topbar.php (92%)
 rename components/testing_framework/{core => Classes/Core}/Acceptance/Support/Page/PageTree.php (97%)
 rename components/testing_framework/{core => Classes/Core}/AccessibleObjectInterface.php (94%)
 rename components/testing_framework/{core => Classes/Core}/BaseTestCase.php (98%)
 rename components/testing_framework/{core => Classes/Core}/Exception.php (91%)
 rename components/testing_framework/{core => Classes/Core}/FileStreamWrapper.php (99%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Constraint/RequestSection/AbstractRecordConstraint.php (95%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Constraint/RequestSection/AbstractStructureRecordConstraint.php (90%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php (88%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php (88%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Constraint/RequestSection/StructureDoesNotHaveRecordConstraint.php (91%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Constraint/RequestSection/StructureHasRecordConstraint.php (93%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/Collector.php (97%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/Hook/BackendUserHandler.php (95%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/Hook/FrontendUserHandler.php (94%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/Parser.php (96%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/Renderer.php (92%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/RequestBootstrap.php (97%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/Response.php (96%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/ResponseContent.php (95%)
 rename components/testing_framework/{core => Classes/Core}/Functional/Framework/Frontend/ResponseSection.php (97%)
 rename components/testing_framework/{core => Classes/Core/Functional}/FunctionalTestCase.php (98%)
 rename components/testing_framework/{core => Classes/Core}/Testbase.php (99%)
 rename components/testing_framework/{core => Classes/Core/Unit}/UnitTestCase.php (93%)
 rename components/testing_framework/{fluid => Classes/Fluid}/Unit/ViewHelpers/ViewHelperBaseTestcase.php (98%)
 rename components/testing_framework/{core => Resources/Core}/Acceptance/Fixtures/be_groups.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Acceptance/Fixtures/be_sessions.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Acceptance/Fixtures/be_users.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Acceptance/Fixtures/sys_category.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Acceptance/Fixtures/tx_extensionmanager_domain_model_extension.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Acceptance/Fixtures/tx_extensionmanager_domain_model_repository.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Build/AcceptanceTests.yml (85%)
 rename components/testing_framework/{core => Resources/Core}/Build/Configuration/Acceptance/Support/AcceptanceTester.php (100%)
 rename components/testing_framework/{core => Resources/Core}/Build/Configuration/Acceptance/Support/Helper/Acceptance.php (100%)
 rename components/testing_framework/{core => Resources/Core}/Build/Configuration/JSUnit/Bootstrap.js (100%)
 rename components/testing_framework/{core => Resources/Core}/Build/Configuration/JSUnit/Helper.js (100%)
 rename components/testing_framework/{core => Resources/Core}/Build/Configuration/JSUnit/karma.conf.js (91%)
 rename components/testing_framework/{core => Resources/Core}/Build/FunctionalTests.xml (79%)
 rename components/testing_framework/{core => Resources/Core}/Build/FunctionalTestsBootstrap.php (92%)
 rename components/testing_framework/{core => Resources/Core}/Build/Scripts/splitFunctionalTests.sh (59%)
 rename components/testing_framework/{core => Resources/Core}/Build/UnitTests.xml (72%)
 rename components/testing_framework/{core => Resources/Core}/Build/UnitTestsBootstrap.php (95%)
 rename components/testing_framework/{core => Resources/Core}/Functional/Fixtures/be_users.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Functional/Fixtures/pages.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Functional/Fixtures/sys_file_storage.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Functional/Fixtures/sys_language.xml (100%)
 rename components/testing_framework/{core => Resources/Core}/Functional/Fixtures/tt_content.xml (100%)

diff --git a/components/testing_framework/core/AcceptanceCoreEnvironment.php b/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
similarity index 94%
rename from components/testing_framework/core/AcceptanceCoreEnvironment.php
rename to components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
index 7bfe0f31ea8c..d0e40e21e81a 100644
--- a/components/testing_framework/core/AcceptanceCoreEnvironment.php
+++ b/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace TYPO3\CMS\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -132,12 +132,12 @@ class AcceptanceCoreEnvironment extends Extension
      * @var array
      */
     protected $xmlDatabaseFixtures = [
-        'components/testing_framework/core/Acceptance/Fixtures/be_users.xml',
-        'components/testing_framework/core/Acceptance/Fixtures/be_sessions.xml',
-        'components/testing_framework/core/Acceptance/Fixtures/be_groups.xml',
-        'components/testing_framework/core/Acceptance/Fixtures/sys_category.xml',
-        'components/testing_framework/core/Acceptance/Fixtures/tx_extensionmanager_domain_model_extension.xml',
-        'components/testing_framework/core/Acceptance/Fixtures/tx_extensionmanager_domain_model_repository.xml',
+        'components/testing_framework/Resources/Core/Acceptance/Fixtures/be_users.xml',
+        'components/testing_framework/Resources/Core/Acceptance/Fixtures/be_sessions.xml',
+        'components/testing_framework/Resources/Core/Acceptance/Fixtures/be_groups.xml',
+        'components/testing_framework/Resources/Core/Acceptance/Fixtures/sys_category.xml',
+        'components/testing_framework/Resources/Core/Acceptance/Fixtures/tx_extensionmanager_domain_model_extension.xml',
+        'components/testing_framework/Resources/Core/Acceptance/Fixtures/tx_extensionmanager_domain_model_repository.xml',
     ];
 
     /**
diff --git a/components/testing_framework/core/Acceptance/Step/Backend/Admin.php b/components/testing_framework/Classes/Core/Acceptance/Step/Backend/Admin.php
similarity index 90%
rename from components/testing_framework/core/Acceptance/Step/Backend/Admin.php
rename to components/testing_framework/Classes/Core/Acceptance/Step/Backend/Admin.php
index df1cc647fe56..6b92f75b2701 100644
--- a/components/testing_framework/core/Acceptance/Step/Backend/Admin.php
+++ b/components/testing_framework/Classes/Core/Acceptance/Step/Backend/Admin.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend;
+namespace TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Acceptance/Step/Backend/Editor.php b/components/testing_framework/Classes/Core/Acceptance/Step/Backend/Editor.php
similarity index 90%
rename from components/testing_framework/core/Acceptance/Step/Backend/Editor.php
rename to components/testing_framework/Classes/Core/Acceptance/Step/Backend/Editor.php
index 711db53d487f..fb368c316f48 100644
--- a/components/testing_framework/core/Acceptance/Step/Backend/Editor.php
+++ b/components/testing_framework/Classes/Core/Acceptance/Step/Backend/Editor.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend;
+namespace TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Acceptance/Support/Helper/FormHandlerElementTestDataObject.php b/components/testing_framework/Classes/Core/Acceptance/Support/Helper/FormHandlerElementTestDataObject.php
similarity index 96%
rename from components/testing_framework/core/Acceptance/Support/Helper/FormHandlerElementTestDataObject.php
rename to components/testing_framework/Classes/Core/Acceptance/Support/Helper/FormHandlerElementTestDataObject.php
index 55b79e43da4a..642d7514a0aa 100644
--- a/components/testing_framework/core/Acceptance/Support/Helper/FormHandlerElementTestDataObject.php
+++ b/components/testing_framework/Classes/Core/Acceptance/Support/Helper/FormHandlerElementTestDataObject.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper;
+namespace TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper;
 
 /**
  * Class FormHandlerElementTestDataObject.
diff --git a/components/testing_framework/core/Acceptance/Support/Helper/Formhandler.php b/components/testing_framework/Classes/Core/Acceptance/Support/Helper/Formhandler.php
similarity index 98%
rename from components/testing_framework/core/Acceptance/Support/Helper/Formhandler.php
rename to components/testing_framework/Classes/Core/Acceptance/Support/Helper/Formhandler.php
index e36c6df49b4e..431443913eb3 100644
--- a/components/testing_framework/core/Acceptance/Support/Helper/Formhandler.php
+++ b/components/testing_framework/Classes/Core/Acceptance/Support/Helper/Formhandler.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper;
+namespace TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Acceptance/Support/Helper/ModalDialog.php b/components/testing_framework/Classes/Core/Acceptance/Support/Helper/ModalDialog.php
similarity index 96%
rename from components/testing_framework/core/Acceptance/Support/Helper/ModalDialog.php
rename to components/testing_framework/Classes/Core/Acceptance/Support/Helper/ModalDialog.php
index 7e3159232847..0c59c372a3e9 100644
--- a/components/testing_framework/core/Acceptance/Support/Helper/ModalDialog.php
+++ b/components/testing_framework/Classes/Core/Acceptance/Support/Helper/ModalDialog.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper;
+namespace TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Acceptance/Support/Helper/Topbar.php b/components/testing_framework/Classes/Core/Acceptance/Support/Helper/Topbar.php
similarity index 92%
rename from components/testing_framework/core/Acceptance/Support/Helper/Topbar.php
rename to components/testing_framework/Classes/Core/Acceptance/Support/Helper/Topbar.php
index 50534b9737a3..3e8c6c3168af 100644
--- a/components/testing_framework/core/Acceptance/Support/Helper/Topbar.php
+++ b/components/testing_framework/Classes/Core/Acceptance/Support/Helper/Topbar.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper;
+namespace TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Acceptance/Support/Page/PageTree.php b/components/testing_framework/Classes/Core/Acceptance/Support/Page/PageTree.php
similarity index 97%
rename from components/testing_framework/core/Acceptance/Support/Page/PageTree.php
rename to components/testing_framework/Classes/Core/Acceptance/Support/Page/PageTree.php
index bc68d11a6f55..0a16be789377 100644
--- a/components/testing_framework/core/Acceptance/Support/Page/PageTree.php
+++ b/components/testing_framework/Classes/Core/Acceptance/Support/Page/PageTree.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Page;
+namespace TYPO3\Components\TestingFramework\Core\Acceptance\Support\Page;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/AccessibleObjectInterface.php b/components/testing_framework/Classes/Core/AccessibleObjectInterface.php
similarity index 94%
rename from components/testing_framework/core/AccessibleObjectInterface.php
rename to components/testing_framework/Classes/Core/AccessibleObjectInterface.php
index 992d7cb308aa..c030c6f84f32 100644
--- a/components/testing_framework/core/AccessibleObjectInterface.php
+++ b/components/testing_framework/Classes/Core/AccessibleObjectInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Components\TestingFramework\Core;
  */
 
 /**
- * This interface defines the methods provided by TYPO3\CMS\Components\TestingFramework\Core\TestCase::getAccessibleMock.::
+ * This interface defines the methods provided by TYPO3\Components\TestingFramework\Core\TestCase::getAccessibleMock.::
  */
 interface AccessibleObjectInterface
 {
diff --git a/components/testing_framework/core/BaseTestCase.php b/components/testing_framework/Classes/Core/BaseTestCase.php
similarity index 98%
rename from components/testing_framework/core/BaseTestCase.php
rename to components/testing_framework/Classes/Core/BaseTestCase.php
index 1410a58fd956..86299d0c26d2 100644
--- a/components/testing_framework/core/BaseTestCase.php
+++ b/components/testing_framework/Classes/Core/BaseTestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -50,7 +50,7 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
      * @param bool $callOriginalClone whether to call the __clone method
      * @param bool $callAutoload whether to call any autoload function
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      *         a mock of $originalClassName with access methods added
      *
      * @throws \InvalidArgumentException
@@ -98,7 +98,7 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
      *
      * @throws \InvalidArgumentException
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      *
      */
     protected function getAccessibleMockForAbstractClass(
@@ -135,7 +135,7 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
 
         eval(
             $abstractModifier . 'class ' . $accessibleClassName .
-                ' extends ' . $className . ' implements ' . \TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface::class . ' {' .
+                ' extends ' . $className . ' implements ' . \TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface::class . ' {' .
                     'public function _call($methodName) {' .
                         'if ($methodName === \'\') {' .
                             'throw new \InvalidArgumentException(\'$methodName must not be empty.\', 1334663993);' .
diff --git a/components/testing_framework/core/Exception.php b/components/testing_framework/Classes/Core/Exception.php
similarity index 91%
rename from components/testing_framework/core/Exception.php
rename to components/testing_framework/Classes/Core/Exception.php
index fead5c2c8fa2..b7b8698daa82 100644
--- a/components/testing_framework/core/Exception.php
+++ b/components/testing_framework/Classes/Core/Exception.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/FileStreamWrapper.php b/components/testing_framework/Classes/Core/FileStreamWrapper.php
similarity index 99%
rename from components/testing_framework/core/FileStreamWrapper.php
rename to components/testing_framework/Classes/Core/FileStreamWrapper.php
index ee49ee4a3d21..34cf739c25c8 100644
--- a/components/testing_framework/core/FileStreamWrapper.php
+++ b/components/testing_framework/Classes/Core/FileStreamWrapper.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/AbstractRecordConstraint.php b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/AbstractRecordConstraint.php
similarity index 95%
rename from components/testing_framework/core/Functional/Framework/Constraint/RequestSection/AbstractRecordConstraint.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/AbstractRecordConstraint.php
index a37e4989897a..332c54c6e28d 100644
--- a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/AbstractRecordConstraint.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/AbstractRecordConstraint.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constr
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
+use TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
 
 /**
  * Model of frontend response
diff --git a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/AbstractStructureRecordConstraint.php b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/AbstractStructureRecordConstraint.php
similarity index 90%
rename from components/testing_framework/core/Functional/Framework/Constraint/RequestSection/AbstractStructureRecordConstraint.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/AbstractStructureRecordConstraint.php
index 16f59835a981..a98e763e2fc8 100644
--- a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/AbstractStructureRecordConstraint.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/AbstractStructureRecordConstraint.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php
similarity index 88%
rename from components/testing_framework/core/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php
index ee2609318812..c11103d45b80 100644
--- a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constr
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
+use TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
 
 /**
  * Model of frontend response
diff --git a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php
similarity index 88%
rename from components/testing_framework/core/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php
index f8c5b4281589..6773f454fc82 100644
--- a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constr
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
+use TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
 
 /**
  * Model of frontend response
diff --git a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/StructureDoesNotHaveRecordConstraint.php b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/StructureDoesNotHaveRecordConstraint.php
similarity index 91%
rename from components/testing_framework/core/Functional/Framework/Constraint/RequestSection/StructureDoesNotHaveRecordConstraint.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/StructureDoesNotHaveRecordConstraint.php
index ba2e1562540b..16352a3271c5 100644
--- a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/StructureDoesNotHaveRecordConstraint.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/StructureDoesNotHaveRecordConstraint.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constr
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
+use TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
 
 /**
  * Model of frontend response
diff --git a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/StructureHasRecordConstraint.php b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/StructureHasRecordConstraint.php
similarity index 93%
rename from components/testing_framework/core/Functional/Framework/Constraint/RequestSection/StructureHasRecordConstraint.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/StructureHasRecordConstraint.php
index a62fe9ccbdaa..e7e4057d6cc7 100644
--- a/components/testing_framework/core/Functional/Framework/Constraint/RequestSection/StructureHasRecordConstraint.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Constraint/RequestSection/StructureHasRecordConstraint.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constr
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
+use TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\ResponseSection;
 
 /**
  * Model of frontend response
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/Collector.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Collector.php
similarity index 97%
rename from components/testing_framework/core/Functional/Framework/Frontend/Collector.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/Collector.php
index c6a817214163..21d29edf9822 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/Collector.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Collector.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -175,7 +175,7 @@ class Collector implements \TYPO3\CMS\Core\SingletonInterface
     protected function getRenderer()
     {
         return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-            \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer::class
+            \TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer::class
         );
     }
 
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/Hook/BackendUserHandler.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Hook/BackendUserHandler.php
similarity index 95%
rename from components/testing_framework/core/Functional/Framework/Frontend/Hook/BackendUserHandler.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/Hook/BackendUserHandler.php
index 3dd8e039b399..cfb177db7405 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/Hook/BackendUserHandler.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Hook/BackendUserHandler.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Hook;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Hook;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/Hook/FrontendUserHandler.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Hook/FrontendUserHandler.php
similarity index 94%
rename from components/testing_framework/core/Functional/Framework/Frontend/Hook/FrontendUserHandler.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/Hook/FrontendUserHandler.php
index 9055ea43542a..4a312c7eb7e0 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/Hook/FrontendUserHandler.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Hook/FrontendUserHandler.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Hook;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Hook;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/Parser.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Parser.php
similarity index 96%
rename from components/testing_framework/core/Functional/Framework/Frontend/Parser.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/Parser.php
index 2e14d7b1fce2..e235e151e1d3 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/Parser.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Parser.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/Renderer.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Renderer.php
similarity index 92%
rename from components/testing_framework/core/Functional/Framework/Frontend/Renderer.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/Renderer.php
index 3d3943483265..7dc3a3ff76c8 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/Renderer.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Renderer.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -86,7 +86,7 @@ class Renderer implements \TYPO3\CMS\Core\SingletonInterface
     protected function createParser()
     {
         return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-            \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Parser::class
+            \TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Parser::class
         );
     }
 }
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/RequestBootstrap.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/RequestBootstrap.php
similarity index 97%
rename from components/testing_framework/core/Functional/Framework/Frontend/RequestBootstrap.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/RequestBootstrap.php
index 53d9bf0f9b4d..e2b0eea10541 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/RequestBootstrap.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/RequestBootstrap.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/Response.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Response.php
similarity index 96%
rename from components/testing_framework/core/Functional/Framework/Frontend/Response.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/Response.php
index 979fb1f3ce9f..e6d4e1a7f56b 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/Response.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/Response.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/ResponseContent.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/ResponseContent.php
similarity index 95%
rename from components/testing_framework/core/Functional/Framework/Frontend/ResponseContent.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/ResponseContent.php
index dffc057fcc10..44edf23e1a3c 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/ResponseContent.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/ResponseContent.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/Functional/Framework/Frontend/ResponseSection.php b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/ResponseSection.php
similarity index 97%
rename from components/testing_framework/core/Functional/Framework/Frontend/ResponseSection.php
rename to components/testing_framework/Classes/Core/Functional/Framework/Frontend/ResponseSection.php
index fa7accb9c52d..4a9e921cd9ed 100644
--- a/components/testing_framework/core/Functional/Framework/Frontend/ResponseSection.php
+++ b/components/testing_framework/Classes/Core/Functional/Framework/Frontend/ResponseSection.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend;
+namespace TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/core/FunctionalTestCase.php b/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
similarity index 98%
rename from components/testing_framework/core/FunctionalTestCase.php
rename to components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
index 867df0064e09..8bcf12606add 100644
--- a/components/testing_framework/core/FunctionalTestCase.php
+++ b/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Components\TestingFramework\Core;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Response;
+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;
@@ -179,7 +179,7 @@ abstract class FunctionalTestCase extends BaseTestCase
      *
      * @var string
      */
-    protected $backendUserFixture = 'components/testing_framework/core/Functional/Fixtures/be_users.xml';
+    protected $backendUserFixture = 'components/testing_framework/Resources/Core/Functional/Fixtures/be_users.xml';
 
     /**
      * Set up creates a test instance and database.
diff --git a/components/testing_framework/core/Testbase.php b/components/testing_framework/Classes/Core/Testbase.php
similarity index 99%
rename from components/testing_framework/core/Testbase.php
rename to components/testing_framework/Classes/Core/Testbase.php
index 6cd5098a354c..97d7d62117db 100644
--- a/components/testing_framework/core/Testbase.php
+++ b/components/testing_framework/Classes/Core/Testbase.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -482,7 +482,7 @@ class Testbase
      *
      * @param string $databaseName Database name of this test instance
      * @param string $originalDatabaseName Original database name before suffix was added
-     * @throws \TYPO3\CMS\Components\TestingFramework\Core\Exception
+     * @throws \TYPO3\Components\TestingFramework\Core\Exception
      * @return void
      */
     public function setUpTestDatabase($databaseName, $originalDatabaseName)
diff --git a/components/testing_framework/core/UnitTestCase.php b/components/testing_framework/Classes/Core/Unit/UnitTestCase.php
similarity index 93%
rename from components/testing_framework/core/UnitTestCase.php
rename to components/testing_framework/Classes/Core/Unit/UnitTestCase.php
index 6c1e1a7663e8..1bdd50afdc73 100644
--- a/components/testing_framework/core/UnitTestCase.php
+++ b/components/testing_framework/Classes/Core/Unit/UnitTestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -64,8 +64,8 @@ abstract class UnitTestCase extends BaseTestCase
             $declaringClass = $property->getDeclaringClass()->getName();
             if (
                 !$property->isStatic()
-                && $declaringClass !== \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase::class
-                && $declaringClass !== \TYPO3\CMS\Components\TestingFramework\Core\BaseTestCase::class
+                && $declaringClass !== \TYPO3\Components\TestingFramework\Core\UnitTestCase::class
+                && $declaringClass !== \TYPO3\Components\TestingFramework\Core\BaseTestCase::class
                 && strpos($property->getDeclaringClass()->getName(), 'PHPUnit_') !== 0
             ) {
                 $propertyName = $property->getName();
diff --git a/components/testing_framework/fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php b/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
similarity index 98%
rename from components/testing_framework/fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
rename to components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
index 39e28fbd9aca..1cd317dba135 100644
--- a/components/testing_framework/fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
+++ b/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers;
+namespace TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -26,7 +26,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 /**
  * Base test class for testing view helpers
  */
-abstract class ViewHelperBaseTestcase extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+abstract class ViewHelperBaseTestcase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var ViewHelperVariableContainer|ObjectProphecy
diff --git a/components/testing_framework/core/Acceptance/Fixtures/be_groups.xml b/components/testing_framework/Resources/Core/Acceptance/Fixtures/be_groups.xml
similarity index 100%
rename from components/testing_framework/core/Acceptance/Fixtures/be_groups.xml
rename to components/testing_framework/Resources/Core/Acceptance/Fixtures/be_groups.xml
diff --git a/components/testing_framework/core/Acceptance/Fixtures/be_sessions.xml b/components/testing_framework/Resources/Core/Acceptance/Fixtures/be_sessions.xml
similarity index 100%
rename from components/testing_framework/core/Acceptance/Fixtures/be_sessions.xml
rename to components/testing_framework/Resources/Core/Acceptance/Fixtures/be_sessions.xml
diff --git a/components/testing_framework/core/Acceptance/Fixtures/be_users.xml b/components/testing_framework/Resources/Core/Acceptance/Fixtures/be_users.xml
similarity index 100%
rename from components/testing_framework/core/Acceptance/Fixtures/be_users.xml
rename to components/testing_framework/Resources/Core/Acceptance/Fixtures/be_users.xml
diff --git a/components/testing_framework/core/Acceptance/Fixtures/sys_category.xml b/components/testing_framework/Resources/Core/Acceptance/Fixtures/sys_category.xml
similarity index 100%
rename from components/testing_framework/core/Acceptance/Fixtures/sys_category.xml
rename to components/testing_framework/Resources/Core/Acceptance/Fixtures/sys_category.xml
diff --git a/components/testing_framework/core/Acceptance/Fixtures/tx_extensionmanager_domain_model_extension.xml b/components/testing_framework/Resources/Core/Acceptance/Fixtures/tx_extensionmanager_domain_model_extension.xml
similarity index 100%
rename from components/testing_framework/core/Acceptance/Fixtures/tx_extensionmanager_domain_model_extension.xml
rename to components/testing_framework/Resources/Core/Acceptance/Fixtures/tx_extensionmanager_domain_model_extension.xml
diff --git a/components/testing_framework/core/Acceptance/Fixtures/tx_extensionmanager_domain_model_repository.xml b/components/testing_framework/Resources/Core/Acceptance/Fixtures/tx_extensionmanager_domain_model_repository.xml
similarity index 100%
rename from components/testing_framework/core/Acceptance/Fixtures/tx_extensionmanager_domain_model_repository.xml
rename to components/testing_framework/Resources/Core/Acceptance/Fixtures/tx_extensionmanager_domain_model_repository.xml
diff --git a/components/testing_framework/core/Build/AcceptanceTests.yml b/components/testing_framework/Resources/Core/Build/AcceptanceTests.yml
similarity index 85%
rename from components/testing_framework/core/Build/AcceptanceTests.yml
rename to components/testing_framework/Resources/Core/Build/AcceptanceTests.yml
index 4bfaa248c383..e011a8eba4f1 100644
--- a/components/testing_framework/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\CMS\Components\TestingFramework\Core\AcceptanceCoreEnvironment
+    - TYPO3\Components\TestingFramework\Core\AcceptanceCoreEnvironment
diff --git a/components/testing_framework/core/Build/Configuration/Acceptance/Support/AcceptanceTester.php b/components/testing_framework/Resources/Core/Build/Configuration/Acceptance/Support/AcceptanceTester.php
similarity index 100%
rename from components/testing_framework/core/Build/Configuration/Acceptance/Support/AcceptanceTester.php
rename to components/testing_framework/Resources/Core/Build/Configuration/Acceptance/Support/AcceptanceTester.php
diff --git a/components/testing_framework/core/Build/Configuration/Acceptance/Support/Helper/Acceptance.php b/components/testing_framework/Resources/Core/Build/Configuration/Acceptance/Support/Helper/Acceptance.php
similarity index 100%
rename from components/testing_framework/core/Build/Configuration/Acceptance/Support/Helper/Acceptance.php
rename to components/testing_framework/Resources/Core/Build/Configuration/Acceptance/Support/Helper/Acceptance.php
diff --git a/components/testing_framework/core/Build/Configuration/JSUnit/Bootstrap.js b/components/testing_framework/Resources/Core/Build/Configuration/JSUnit/Bootstrap.js
similarity index 100%
rename from components/testing_framework/core/Build/Configuration/JSUnit/Bootstrap.js
rename to components/testing_framework/Resources/Core/Build/Configuration/JSUnit/Bootstrap.js
diff --git a/components/testing_framework/core/Build/Configuration/JSUnit/Helper.js b/components/testing_framework/Resources/Core/Build/Configuration/JSUnit/Helper.js
similarity index 100%
rename from components/testing_framework/core/Build/Configuration/JSUnit/Helper.js
rename to components/testing_framework/Resources/Core/Build/Configuration/JSUnit/Helper.js
diff --git a/components/testing_framework/core/Build/Configuration/JSUnit/karma.conf.js b/components/testing_framework/Resources/Core/Build/Configuration/JSUnit/karma.conf.js
similarity index 91%
rename from components/testing_framework/core/Build/Configuration/JSUnit/karma.conf.js
rename to components/testing_framework/Resources/Core/Build/Configuration/JSUnit/karma.conf.js
index 9f82f999fb53..e0740d44a4ed 100644
--- a/components/testing_framework/core/Build/Configuration/JSUnit/karma.conf.js
+++ b/components/testing_framework/Resources/Core/Build/Configuration/JSUnit/karma.conf.js
@@ -7,7 +7,7 @@
 module.exports = function(config) {
 	config.set({
 		// base path that will be used to resolve all patterns (eg. files, exclude)
-		basePath: '../../../../../../',
+		basePath: '../../../../../../../',
 
 		// frameworks to use
 		// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
@@ -18,8 +18,8 @@ module.exports = function(config) {
 			{ pattern: 'typo3/sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-3.1.1.js', included: true },
 			{ pattern: 'typo3/sysext/**/Resources/Public/JavaScript/**/*.js', included: false },
 			{ pattern: 'typo3/sysext/**/Tests/JavaScript/**/*.js', included: false },
-			'components/testing_framework/core/Build/Configuration/JSUnit/Helper.js',
-			'components/testing_framework/core/Build/Configuration/JSUnit/Bootstrap.js'
+			'components/testing_framework/Resources/Core/Build/Configuration/JSUnit/Helper.js',
+			'components/testing_framework/Resources/Core/Build/Configuration/JSUnit/Bootstrap.js'
 		],
 
 		// list of files to exclude
diff --git a/components/testing_framework/core/Build/FunctionalTests.xml b/components/testing_framework/Resources/Core/Build/FunctionalTests.xml
similarity index 79%
rename from components/testing_framework/core/Build/FunctionalTests.xml
rename to components/testing_framework/Resources/Core/Build/FunctionalTests.xml
index cfa3bb0204aa..7fa9c4081e8f 100644
--- a/components/testing_framework/core/Build/FunctionalTests.xml
+++ b/components/testing_framework/Resources/Core/Build/FunctionalTests.xml
@@ -1,7 +1,7 @@
 <!--
 	Functional test suites setup
 
-	Functional tests should extend from \TYPO3\CMS\Components\TestingFramework\Core\Tests\FunctionalTestCase,
+	Functional tests should extend from \TYPO3\Components\TestingFramework\Core\Tests\FunctionalTestCase,
 	take a look at this class for further documentation on how to run the suite.
 
 	TYPO3 CMS functional test suite also needs phpunit bootstrap code, the
@@ -24,7 +24,7 @@
 >
 	<testsuites>
 		<testsuite name="Core tests">
-			<directory>../../../../typo3/sysext/*/Tests/Functional/</directory>
+			<directory>../../../../../typo3/sysext/*/Tests/Functional/</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/components/testing_framework/core/Build/FunctionalTestsBootstrap.php b/components/testing_framework/Resources/Core/Build/FunctionalTestsBootstrap.php
similarity index 92%
rename from components/testing_framework/core/Build/FunctionalTestsBootstrap.php
rename to components/testing_framework/Resources/Core/Build/FunctionalTestsBootstrap.php
index 483091ccb2ae..4c7d1da08c48 100644
--- a/components/testing_framework/core/Build/FunctionalTestsBootstrap.php
+++ b/components/testing_framework/Resources/Core/Build/FunctionalTestsBootstrap.php
@@ -18,7 +18,7 @@
  * with phpunit parameter --bootstrap if executing single test case classes.
  */
 call_user_func(function () {
-    $testbase = new \TYPO3\CMS\Components\TestingFramework\Core\Testbase();
+    $testbase = new \TYPO3\Components\TestingFramework\Core\Testbase();
     $testbase->enableDisplayErrors();
     $testbase->defineBaseConstants();
     $testbase->defineOriginalRootPath();
diff --git a/components/testing_framework/core/Build/Scripts/splitFunctionalTests.sh b/components/testing_framework/Resources/Core/Build/Scripts/splitFunctionalTests.sh
similarity index 59%
rename from components/testing_framework/core/Build/Scripts/splitFunctionalTests.sh
rename to components/testing_framework/Resources/Core/Build/Scripts/splitFunctionalTests.sh
index 49a54fdfcba4..febbf657f4ac 100755
--- a/components/testing_framework/core/Build/Scripts/splitFunctionalTests.sh
+++ b/components/testing_framework/Resources/Core/Build/Scripts/splitFunctionalTests.sh
@@ -46,26 +46,26 @@ cat buildTemp/testFilesWithNumberOfTestFiles.txt | sort -n -r > buildTemp/testFi
 
 # Config file boilerplate per job
 for (( i=0; i<${numberOfFunctionalTestJobs}; i++)); do
-	if [ -f components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml ]; then
-		rm components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
+	if [ -f components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml ]; then
+		rm components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
 	fi
-	echo '<phpunit' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	backupGlobals="true"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	backupStaticAttributes="false"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	bootstrap="FunctionalTestsBootstrap.php"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	colors="true"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	convertErrorsToExceptions="true"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	convertWarningsToExceptions="true"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	forceCoversAnnotation="false"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	processIsolation="true"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	stopOnError="false"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	stopOnFailure="false"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	stopOnIncomplete="false"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	stopOnSkipped="false"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	verbose="false"' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '>' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	<testsuites>' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '		<testsuite name="Core tests">' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
+	echo '<phpunit' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	backupGlobals="true"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	backupStaticAttributes="false"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	bootstrap="FunctionalTestsBootstrap.php"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	colors="true"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	convertErrorsToExceptions="true"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	convertWarningsToExceptions="true"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	forceCoversAnnotation="false"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	processIsolation="true"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	stopOnError="false"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	stopOnFailure="false"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	stopOnIncomplete="false"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	stopOnSkipped="false"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	verbose="false"' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '>' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	<testsuites>' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '		<testsuite name="Core tests">' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
 done
 
 counter=0
@@ -97,17 +97,17 @@ while read testFileWeighted; do
 		fi
 	fi
 
-	echo '			<directory>' >> components/testing_framework/core/Build/FunctionalTests-Job-${targetJobNumberForFile}.xml
-	echo "				../../../../${testFile}" >> components/testing_framework/core/Build/FunctionalTests-Job-${targetJobNumberForFile}.xml
-	echo '			</directory>' >> components/testing_framework/core/Build/FunctionalTests-Job-${targetJobNumberForFile}.xml
+	echo '			<directory>' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${targetJobNumberForFile}.xml
+	echo "				../../../../../${testFile}" >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${targetJobNumberForFile}.xml
+	echo '			</directory>' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${targetJobNumberForFile}.xml
 	(( counter ++ ))
 done < buildTemp/testFilesWeighted.txt
 
 # Final part of config file
 for (( i=0; i<${numberOfFunctionalTestJobs}; i++)); do
-	echo '		</testsuite>' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '	</testsuites>' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
-	echo '</phpunit>' >> components/testing_framework/core/Build/FunctionalTests-Job-${i}.xml
+	echo '		</testsuite>' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '	</testsuites>' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
+	echo '</phpunit>' >> components/testing_framework/Resources/Core/Build/FunctionalTests-Job-${i}.xml
 done
 
 # Clean up
diff --git a/components/testing_framework/core/Build/UnitTests.xml b/components/testing_framework/Resources/Core/Build/UnitTests.xml
similarity index 72%
rename from components/testing_framework/core/Build/UnitTests.xml
rename to components/testing_framework/Resources/Core/Build/UnitTests.xml
index 00789368bccc..4b231eb100cd 100644
--- a/components/testing_framework/core/Build/UnitTests.xml
+++ b/components/testing_framework/Resources/Core/Build/UnitTests.xml
@@ -15,13 +15,13 @@
 >
 	<testsuites>
 		<testsuite name="Core tests">
-			<directory>../../../../typo3/sysext/*/Tests/Unit/</directory>
+			<directory>../../../../../typo3/sysext/*/Tests/Unit/</directory>
 		</testsuite>
 		<testsuite name="Core legacy tests">
-			<directory>../../../../typo3/sysext/core/Tests/Legacy/</directory>
+			<directory>../../../../../typo3/sysext/core/Tests/Legacy/</directory>
 		</testsuite>
 		<testsuite name="Suite integrity tests">
-			<directory>../../../../typo3/sysext/core/Tests/Integrity/</directory>
+			<directory>../../../../../typo3/sysext/core/Tests/Integrity/</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/components/testing_framework/core/Build/UnitTestsBootstrap.php b/components/testing_framework/Resources/Core/Build/UnitTestsBootstrap.php
similarity index 95%
rename from components/testing_framework/core/Build/UnitTestsBootstrap.php
rename to components/testing_framework/Resources/Core/Build/UnitTestsBootstrap.php
index 4f396d9f5226..04af80bbec08 100644
--- a/components/testing_framework/core/Build/UnitTestsBootstrap.php
+++ b/components/testing_framework/Resources/Core/Build/UnitTestsBootstrap.php
@@ -27,7 +27,7 @@
  *     typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
  */
 call_user_func(function () {
-    $testbase = new \TYPO3\CMS\Components\TestingFramework\Core\Testbase();
+    $testbase = new \TYPO3\Components\TestingFramework\Core\Testbase();
     $testbase->enableDisplayErrors();
     $testbase->defineBaseConstants();
     $testbase->defineSitePath();
@@ -43,7 +43,7 @@ call_user_func(function () {
     define('TYPO3_DLOG', false);
 
     // Retrieve an instance of class loader and inject to core bootstrap
-    $classLoaderFilepath = __DIR__ . '/../../../../vendor/autoload.php';
+    $classLoaderFilepath = __DIR__ . '/../../../../../vendor/autoload.php';
     if (!file_exists($classLoaderFilepath)) {
         die('ClassLoader can\'t be loaded. Please check your path or set an environment variable \'TYPO3_PATH_WEB\' to your root path.');
     }
diff --git a/components/testing_framework/core/Functional/Fixtures/be_users.xml b/components/testing_framework/Resources/Core/Functional/Fixtures/be_users.xml
similarity index 100%
rename from components/testing_framework/core/Functional/Fixtures/be_users.xml
rename to components/testing_framework/Resources/Core/Functional/Fixtures/be_users.xml
diff --git a/components/testing_framework/core/Functional/Fixtures/pages.xml b/components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml
similarity index 100%
rename from components/testing_framework/core/Functional/Fixtures/pages.xml
rename to components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml
diff --git a/components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml b/components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml
similarity index 100%
rename from components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml
rename to components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml
diff --git a/components/testing_framework/core/Functional/Fixtures/sys_language.xml b/components/testing_framework/Resources/Core/Functional/Fixtures/sys_language.xml
similarity index 100%
rename from components/testing_framework/core/Functional/Fixtures/sys_language.xml
rename to components/testing_framework/Resources/Core/Functional/Fixtures/sys_language.xml
diff --git a/components/testing_framework/core/Functional/Fixtures/tt_content.xml b/components/testing_framework/Resources/Core/Functional/Fixtures/tt_content.xml
similarity index 100%
rename from components/testing_framework/core/Functional/Fixtures/tt_content.xml
rename to components/testing_framework/Resources/Core/Functional/Fixtures/tt_content.xml
diff --git a/components/testing_framework/compat/core/AccessibleObjectInterface.php b/components/testing_framework/compat/core/AccessibleObjectInterface.php
index b75f26aba3ad..5476ae698071 100644
--- a/components/testing_framework/compat/core/AccessibleObjectInterface.php
+++ b/components/testing_framework/compat/core/AccessibleObjectInterface.php
@@ -17,6 +17,6 @@ namespace TYPO3\CMS\Core\Tests;
 /**
  * @deprecated since TYPO3 8, will be removed in TYPO3 9
  */
-interface AccessibleObjectInterface extends \TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+interface AccessibleObjectInterface extends \TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
 {
 }
diff --git a/components/testing_framework/compat/core/BaseTestCase.php b/components/testing_framework/compat/core/BaseTestCase.php
index 7deae5d9d32f..fd0cb10d4a95 100644
--- a/components/testing_framework/compat/core/BaseTestCase.php
+++ b/components/testing_framework/compat/core/BaseTestCase.php
@@ -17,6 +17,6 @@ namespace TYPO3\CMS\Core\Tests;
 /**
  * @deprecated since TYPO3 8, will be removed in TYPO3 9
  */
-abstract class BaseTestCase extends \TYPO3\CMS\Components\TestingFramework\Core\BaseTestCase
+abstract class BaseTestCase extends \TYPO3\Components\TestingFramework\Core\BaseTestCase
 {
 }
diff --git a/components/testing_framework/compat/core/Exception.php b/components/testing_framework/compat/core/Exception.php
index 72bc845c61c2..7e3df47d6102 100644
--- a/components/testing_framework/compat/core/Exception.php
+++ b/components/testing_framework/compat/core/Exception.php
@@ -17,6 +17,6 @@ namespace TYPO3\CMS\Core\Tests;
 /**
  * @deprecated since TYPO3 8, will be removed in TYPO3 9
  */
-class Exception extends \TYPO3\CMS\Components\TestingFramework\Core\Exception
+class Exception extends \TYPO3\Components\TestingFramework\Core\Exception
 {
 }
diff --git a/components/testing_framework/compat/core/FileStreamWrapper.php b/components/testing_framework/compat/core/FileStreamWrapper.php
index de6b50b182d1..fd573ca2b300 100644
--- a/components/testing_framework/compat/core/FileStreamWrapper.php
+++ b/components/testing_framework/compat/core/FileStreamWrapper.php
@@ -17,6 +17,6 @@ namespace TYPO3\CMS\Core\Tests;
 /**
  * @deprecated since TYPO3 8, will be removed in TYPO3 9
  */
-class FileStreamWrapper extends \TYPO3\CMS\Components\TestingFramework\Core\FileStreamWrapper
+class FileStreamWrapper extends \TYPO3\Components\TestingFramework\Core\FileStreamWrapper
 {
 }
diff --git a/components/testing_framework/compat/core/FunctionalTestCase.php b/components/testing_framework/compat/core/FunctionalTestCase.php
index b2ac7a27e00f..b7da53a0e137 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+abstract class FunctionalTestCase extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
 }
diff --git a/components/testing_framework/compat/core/Testbase.php b/components/testing_framework/compat/core/Testbase.php
index af506250e993..1364d1a267cb 100644
--- a/components/testing_framework/compat/core/Testbase.php
+++ b/components/testing_framework/compat/core/Testbase.php
@@ -17,6 +17,6 @@ namespace TYPO3\CMS\Core\Tests;
 /**
  * @deprecated since TYPO3 8, will be removed in TYPO3 9
  */
-class Testbase extends \TYPO3\CMS\Components\TestingFramework\Core\Testbase
+class Testbase extends \TYPO3\Components\TestingFramework\Core\Testbase
 {
 }
diff --git a/components/testing_framework/compat/core/UnitTestCase.php b/components/testing_framework/compat/core/UnitTestCase.php
index b9d6cf76357e..7af4c8cb0916 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\CMS\Components\TestingFramework\Core\UnitTestCase
+abstract class UnitTestCase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 }
diff --git a/components/testing_framework/compat/fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php b/components/testing_framework/compat/fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
index ca763e5c50d5..6ed7f29e4490 100644
--- a/components/testing_framework/compat/fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
+++ b/components/testing_framework/compat/fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
@@ -17,6 +17,6 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
 /**
  * @deprecated since TYPO3 8, will be removed in TYPO3 9
  */
-abstract class ViewHelperBaseTestcase extends \TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase
+abstract class ViewHelperBaseTestcase extends \TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase
 {
 }
diff --git a/composer.json b/composer.json
index 2db074c7ebfe..b5d3f4d06255 100644
--- a/composer.json
+++ b/composer.json
@@ -187,8 +187,7 @@
 			"TYPO3\\CMS\\WizardCrpages\\": "typo3/sysext/wizard_crpages/Classes/",
 			"TYPO3\\CMS\\WizardSortpages\\": "typo3/sysext/wizard_sortpages/Classes/",
 			"TYPO3\\CMS\\Workspaces\\": "typo3/sysext/workspaces/Classes/",
-			"TYPO3\\CMS\\Components\\TestingFramework\\Core\\": "components/testing_framework/core/",
-			"TYPO3\\CMS\\Components\\TestingFramework\\Fluid\\": "components/testing_framework/fluid/",
+			"TYPO3\\Components\\TestingFramework\\": "components/testing_framework/Classes/",
 			"TYPO3\\CMS\\Core\\Tests\\": "components/testing_framework/compat/core/",
 			"TYPO3\\CMS\\Fluid\\Tests\\": "components/testing_framework/compat/fluid/"
 		},
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
index 243cd9311a8c..36b7ee209165 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class LocalizationControllerTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var LocalizationController
@@ -42,7 +42,7 @@ class LocalizationControllerTest extends \TYPO3\CMS\Components\TestingFramework\
         Bootstrap::getInstance()->initializeLanguageObject();
 
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/backend/Tests/Functional/Fixtures/pages.xml');
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/sys_language.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/sys_language.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/backend/Tests/Functional/Controller/Page/Fixtures/tt_content-default-language.xml');
 
         $this->subject = new 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 a56b999cd8c8..429722589bcd 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/EditDocumentControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/EditDocumentControllerTest.php
index 81d62946e350..fbba77eb1dcb 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EditDocumentControllerTest extends \TYPO3\Components\TestingFramework\Core\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 b90d23fd5c46..428ebb9be840 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
@@ -20,10 +20,10 @@ use TYPO3\CMS\Core\Http\ServerRequest;
 /**
  * Tests for \TYPO3\CMS\Backend\Tests\Unit\Controller\File\FileController
  */
-class FileControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Backend\Controller\File\FileController|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Backend\Controller\File\FileController|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $fileController;
 
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/FormInlineAjaxControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/FormInlineAjaxControllerTest.php
index e0f1715bc8e7..73f695c0eaf6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormInlineAjaxControllerTest extends \TYPO3\Components\TestingFramework\Core\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 39cdeab8deba..0253fd8f874a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormSelectTreeAjaxControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php
index 692a2a483f4b..4575e9541d2f 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php
@@ -20,10 +20,10 @@ use TYPO3\CMS\Backend\LoginProvider\UsernamePasswordLoginProvider;
 /**
  * Class LoginControllerTest
  */
-class LoginControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class LoginControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var LoginController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var LoginController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $loginControllerMock;
 
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php
index f1719f8fca5e..5308a3848548 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PageLayoutControllerTest extends \TYPO3\Components\TestingFramework\Core\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 bce514a57e36..c489048f7441 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SuggestWizardControllerTest extends \TYPO3\Components\TestingFramework\Core\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 67342225c944..0ff0d956a09b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractFormElementTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @return array
@@ -275,7 +275,7 @@ class AbstractFormElementTest extends \TYPO3\CMS\Components\TestingFramework\Cor
      */
     public function formatValueWithGivenConfiguration($config, $itemValue, $expectedResult)
     {
-        /** @var AbstractFormElement|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var AbstractFormElement|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(AbstractFormElement::class, ['render'], [], '', false);
         $timezoneBackup = date_default_timezone_get();
         date_default_timezone_set('UTC');
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php b/typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php
index 07dd3ea17ed7..c9b8bc2aa195 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InputDateTimeElementTest extends \TYPO3\Components\TestingFramework\Core\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 781f59f362b4..66ca49703bc8 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InputHiddenElementTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php
index f1850b2d1539..dc73d2e46b40 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormDataCompilerTest extends \TYPO3\Components\TestingFramework\Core\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 1548bf509566..2018cd0c1299 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FlexFormSegmentTest extends \TYPO3\Components\TestingFramework\Core\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 ed5f87ce355e..e81a66bf8e02 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InlineParentRecordTest extends \TYPO3\Components\TestingFramework\Core\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 4f08f9ee3cb6..2e71be6d57ba 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class OnTheFlyTest extends \TYPO3\Components\TestingFramework\Core\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 dce51baa7327..87534616b980 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class OrderedProviderListTest extends \TYPO3\Components\TestingFramework\Core\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 48c4aa8defda..3fd2bf3cc86b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaDatabaseRecordTest extends \TYPO3\Components\TestingFramework\Core\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 802587bd4df8..a0f33a8aceec 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaInputPlaceholderRecordTest extends \TYPO3\Components\TestingFramework\Core\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 a668267162d2..3ff7cd1a4e17 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseEditRowTest extends \TYPO3\Components\TestingFramework\Core\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 e8f3b7bb59c3..5b678734c157 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseEffectivePidTest extends \TYPO3\Components\TestingFramework\Core\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 2093d5f1b201..ba63d8918d83 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseLanguageRowsTest extends \TYPO3\Components\TestingFramework\Core\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 b584066bb4e8..7fae2a580b64 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabasePageLanguageOverlayRowsTest extends \TYPO3\Components\TestingFramework\Core\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 cd3d2c62f44a..4a80d19a9a36 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseParentPageRowTest extends \TYPO3\Components\TestingFramework\Core\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 a65bf4318379..77229228aae6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRecordOverrideValuesTest extends \TYPO3\Components\TestingFramework\Core\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 ae42bece14da..901cacbf0d6f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRecordTypeValueTest extends \TYPO3\Components\TestingFramework\Core\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 f1f338acfaac..4e8d4dd2e57f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRowDateTimeFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 31142f9352f0..ed4843d76d21 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRowDefaultValuesTest extends \TYPO3\Components\TestingFramework\Core\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 b8040f183f6c..33619934ed93 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRowInitializeNewTest extends \TYPO3\Components\TestingFramework\Core\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 ebf78462a102..bc7b8914fdf7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseSystemLanguageRowsTest extends \TYPO3\Components\TestingFramework\Core\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 67af5af208c5..6e495e3e9f49 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseUniqueUidNewRowTest extends \TYPO3\Components\TestingFramework\Core\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 fc5fc2de7359..4c88f4700073 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseUserPermissionCheckTest extends \TYPO3\Components\TestingFramework\Core\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 d54e1549945c..087214a295d7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EvaluateDisplayConditionsTest extends \TYPO3\Components\TestingFramework\Core\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 7177d94f14ce..ef1d3df87ce3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InitializeProcessedTcaTest extends \TYPO3\Components\TestingFramework\Core\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 0c3836f3e592..2d1dd5477e9d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InlineOverrrideChildTcaTest extends \TYPO3\Components\TestingFramework\Core\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 688e8e36d4a5..767175a4e20e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PageTsConfigMergedTest extends \TYPO3\Components\TestingFramework\Core\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 42bef368a5a4..a4fde95e3d6a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ParentPageTcaTest extends \TYPO3\Components\TestingFramework\Core\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 e0c1979c6bf0..005d99810fb0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaCheckboxItemsTest extends \TYPO3\Components\TestingFramework\Core\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 7dfdb55347db..d3362be1d1fe 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsOverridesTest extends \TYPO3\Components\TestingFramework\Core\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 c9e406653ca6..387488f20a26 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessCommonTest extends \TYPO3\Components\TestingFramework\Core\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 547a884f9567..d4e9e7dde60f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessFieldLabelsTest extends \TYPO3\Components\TestingFramework\Core\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 5c31c32ea973..c01d58b5bbf1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessPlaceholdersTest extends \TYPO3\Components\TestingFramework\Core\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 2d801ba215f9..88b64f84f906 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessRecordTitleTest extends \TYPO3\Components\TestingFramework\Core\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 1965aeef6d0f..5acf009816bf 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessShowitemTest extends \TYPO3\Components\TestingFramework\Core\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 c4c1b25fdad5..5c161858ca67 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsRemoveUnusedTest extends \TYPO3\Components\TestingFramework\Core\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 4faf6bd8ef75..c5290e7600ca 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaFlexPrepareTest extends \TYPO3\Components\TestingFramework\Core\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 3c5c5773b8f5..90954a7f3ee6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaFlexProcessTest extends \TYPO3\Components\TestingFramework\Core\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 429763bde491..da45dcdf3021 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaGroupTest extends \TYPO3\Components\TestingFramework\Core\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 7a1420a23cac..e76b02af946c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaInlineConfigurationTest extends \TYPO3\Components\TestingFramework\Core\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 10f6cb988fc5..4fea6a435f47 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaInlineExpandCollapseStateTest extends \TYPO3\Components\TestingFramework\Core\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 b617f6ce9136..0af62c35409c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaInlineIsOnSymmetricSideTest extends \TYPO3\Components\TestingFramework\Core\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 8ab0d23e1162..49fc50e37fa8 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaInlineTest extends \TYPO3\Components\TestingFramework\Core\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 d6c78352b1e3..7f5c140f54ac 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaInputPlaceholdersTest extends \TYPO3\Components\TestingFramework\Core\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 2693caa9ec7f..98a428d6b2d1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaRadioItemsTest extends \TYPO3\Components\TestingFramework\Core\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 acded260eb6f..700b0751c899 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaRecordTitleTest extends \TYPO3\Components\TestingFramework\Core\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 14a5ac6d0ac0..837b4de4ad47 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaSelectItemsTest extends \TYPO3\Components\TestingFramework\Core\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 dfbc34918048..5502d2abc1cc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaSelectTreeItemsTest extends \TYPO3\Components\TestingFramework\Core\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 342d6fde4236..50e01605d78b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaTextTest extends \TYPO3\Components\TestingFramework\Core\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 d83676077883..20d202821a98 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaTypesShowitemTest extends \TYPO3\Components\TestingFramework\Core\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 593beb8753a4..9480c6408e42 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class UserTsConfigTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var UserTsConfig
diff --git a/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php b/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
index 8ad2e4bc0e25..41a990f13787 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InlineStackProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
@@ -252,7 +252,7 @@ class InlineStackProcessorTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function initializeByParsingDomObjectIdStringParsesStructureString($string, array $expectedInlineStructure, array $_)
     {
-        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(InlineStackProcessor::class, ['dummy']);
         $subject->initializeByParsingDomObjectIdString($string);
         $structure = $subject->_get('inlineStructure');
@@ -265,7 +265,7 @@ class InlineStackProcessorTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function getCurrentStructureFormPrefixReturnsExceptedStringAfterInitializationByStructureString($string, array $_, array $expectedFormName)
     {
-        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = new InlineStackProcessor;
         $subject->initializeByParsingDomObjectIdString($string);
         $this->assertEquals($expectedFormName['form'], $subject->getCurrentStructureFormPrefix());
@@ -277,7 +277,7 @@ class InlineStackProcessorTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function getCurrentStructureDomObjectIdPrefixReturnsExceptedStringAfterInitializationByStructureString($string, array $_, array $expectedFormName)
     {
-        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = new InlineStackProcessor;
         $subject->initializeByParsingDomObjectIdString($string);
         $this->assertEquals($expectedFormName['object'], $subject->getCurrentStructureDomObjectIdPrefix('pageId'));
diff --git a/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php b/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
index 6362c9926f15..137d4da15af0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class NodeFactoryTest extends \TYPO3\Components\TestingFramework\Core\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 3b8fc863309a..e33580c4333b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormEngineUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 063f25705294..b7d12c3b5ed9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SuggestWizardTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Module/ModuleLoaderTest.php b/typo3/sysext/backend/Tests/Unit/Module/ModuleLoaderTest.php
index 2e441c6c15a3..4a8eaf038c09 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ModuleLoaderTest extends \TYPO3\Components\TestingFramework\Core\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 8bbdffd68dae..6d33a6534ea7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FullyRenderedButtonTest extends \TYPO3\Components\TestingFramework\Core\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 b1851a351bbb..0bc856bb50db 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InputButtonTest extends \TYPO3\Components\TestingFramework\Core\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 6030164e460f..28017a38a339 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LinkButtonTest extends \TYPO3\Components\TestingFramework\Core\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 aae1aa2784cd..82b46d28354f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SplitButtonTest extends \TYPO3\Components\TestingFramework\Core\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 4166f3512bcc..2ffd357b13c7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MenuItemTest extends \TYPO3\Components\TestingFramework\Core\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 a71532c391bd..4bff52c0db02 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MenuTest extends \TYPO3\Components\TestingFramework\Core\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 60e97a7d74ab..ce02145ff68a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DataProviderTest extends \TYPO3\Components\TestingFramework\Core\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 029b5ce01f36..bc43d57161e0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SortedTreeNodeCollectionTest extends \TYPO3\Components\TestingFramework\Core\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 f02c844445db..855c4803d5c8 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TreeNodeCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php
index a52f2e22eb65..a8cbcaca1774 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TreeNodeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     //////////////////////
     // Utility functions
diff --git a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
index c3d449afca64..12c8773d03d4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     ///////////////////////////////////////
     // Tests concerning calcAge
@@ -986,7 +986,7 @@ class BackendUtilityTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
 
         $GLOBALS['TCA'] = $tca;
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|BackendUtility $subject */
+        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|BackendUtility $subject */
         $subject = $this->getAccessibleMock(BackendUtility::class, ['dummy']);
         $this->assertSame($expected, $subject->_call('replaceL10nModeFields', $table, $row));
     }
diff --git a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php
index a2563b6e0453..8b6a286b1625 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendLayoutCollectionTest extends \TYPO3\Components\TestingFramework\Core\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 f71bbef813c1..ce848b17a80a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendLayoutTest extends \TYPO3\Components\TestingFramework\Core\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 8b1b97296bec..75f995093832 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DataProviderCollectionTest extends \TYPO3\Components\TestingFramework\Core\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 4c520b0a2575..b00a6b853a87 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendLayoutViewTest extends \TYPO3\Components\TestingFramework\Core\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 0f6591fa11c5..ad2cb39dd8e8 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConstraintTest extends \TYPO3\Components\TestingFramework\Core\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 9faad5640468..9b2e024b9262 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LogEntryTest extends \TYPO3\Components\TestingFramework\Core\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 62f564517031..eec65888913b 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class HistoryEntryRepositoryTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class HistoryEntryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $querySettings = null;
 
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
index 888a3ce307c5..ab5d59ebea45 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LogEntryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 311bc2f72be7..c7e971340c10 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class WorkspaceRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 66bb5470ca14..b321ee9c974a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUserTest extends \TYPO3\Components\TestingFramework\Core\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 4817a87a51e5..bf163750dbf6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DemandTest extends \TYPO3\Components\TestingFramework\Core\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 4da106525442..667f1fcb51d7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUserRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 3301d7b58293..e9617f58dad4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUserSessionRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
index fccd1f72372b..72616f593119 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ModuleDataStorageServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-79025-ExtractTestingFrameworkForTYPO3.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-79025-ExtractTestingFrameworkForTYPO3.rst
index 7841e42b20d1..75f12bafb08f 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-79025-ExtractTestingFrameworkForTYPO3.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-79025-ExtractTestingFrameworkForTYPO3.rst
@@ -33,7 +33,7 @@ All installations using core testing components as base.
 Migration
 =========
 
-Change the namespace from TYPO3\CMS\Core\Tests to TYPO3\CMS\Components\TestingFramework\Core or in case of the xml fixtures the corresponding file path.
+Change the namespace from TYPO3\CMS\Core\Tests to TYPO3\Components\TestingFramework\Core or in case of the xml fixtures the corresponding file path.
 
 If you need to ensure compatibility with multiple TYPO3 versions, use the base test classes with their old names.
 
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php
index 11184c57b49b..5dd6ebd056b8 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\BackendUser;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * List User tests
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/GetExtensionsCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/GetExtensionsCest.php
index 219345691df3..85a95bcc54b3 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/GetExtensionsCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/GetExtensionsCest.php
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Extensionmanager;
  */
 
 use Facebook\WebDriver\WebDriverKeys;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Tests for the "Get Extensions view" of the extension manager
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/InstalledExtensionsCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/InstalledExtensionsCest.php
index 73ee65ac4016..cd2797696018 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/InstalledExtensionsCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/InstalledExtensionsCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Extensionmanager;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Tests for the "Install list view" of the extension manager
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/CategoryTreeCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/CategoryTreeCest.php
index aac54f36a403..d4d1a2c0cfe3 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/CategoryTreeCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/CategoryTreeCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Formhandler;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Category tree tests
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/ElementsBasicCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/ElementsBasicCest.php
index 7c69ea3b5c97..292ce32f4100 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/ElementsBasicCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/ElementsBasicCest.php
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Formhandler;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Formhandler;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\FormHandlerElementTestDataObject;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Page\PageTree;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Formhandler;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\FormHandlerElementTestDataObject;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Page\PageTree;
 
 /**
  * Tests for basic element fields
@@ -295,8 +295,8 @@ class ElementsBasicCest
     }
 
     /**
-     * @param \TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin $I
-     * @param \TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Formhandler $formhandler
+     * @param \TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin $I
+     * @param \TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Formhandler $formhandler
      * @skip
      */
     public function checkThatBrowserSideValidationWorks_EvalDate(Admin $I, Formhandler $formhandler)
@@ -528,7 +528,7 @@ class ElementsBasicCest
     }
 
     /**
-     * @param \TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Formhandler $formhandler
+     * @param \TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Formhandler $formhandler
      * @param $fieldData
      */
     protected function runTests(Formhandler $formhandler, $fieldData)
@@ -542,7 +542,7 @@ class ElementsBasicCest
     }
 
     /**
-     * @param \TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin $I
+     * @param \TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin $I
      */
     protected function waitForFormReady(Admin $I)
     {
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/ElementsGroupCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/ElementsGroupCest.php
index b2ad84f68a40..ca77f3fe57a8 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/ElementsGroupCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/ElementsGroupCest.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Formhandler;
  */
 
 use Facebook\WebDriver\Exception\NoSuchWindowException;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Page\PageTree;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Page\PageTree;
 
 /**
  * Tests for ElementsGroupelement fields
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/Inline1nCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/Inline1nCest.php
index fa412eb26ef2..b253c81b3783 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/Inline1nCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/Inline1nCest.php
@@ -15,10 +15,10 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Formhandler;
  */
 
 use Facebook\WebDriver\WebDriverKeys;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Formhandler;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\ModalDialog;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Page\PageTree;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Formhandler;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\ModalDialog;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Page\PageTree;
 
 /**
  * Tests for inline 1n
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/General/ModuleMenuCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/General/ModuleMenuCest.php
index 8b260df91cbd..26660568b18a 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/General/ModuleMenuCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/General/ModuleMenuCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\General;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Module Menu tests
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Install/InstallModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Install/InstallModuleCest.php
index 3b248598502d..2c00b40c5b88 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Install/InstallModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Install/InstallModuleCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Language;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Install Module tests
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Language/LanguageCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Language/LanguageCest.php
index 6c5fcaf01927..f75a9e4fcd32 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Language/LanguageCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Language/LanguageCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Language;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Language tests
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php
index b7edb2a05bb2..8fa63621943e 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Login;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
 
 /**
  * Various backend login related tests
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
index 2ebf59d95036..24c05f0d4fc9 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Page;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Page and page tree related tests.
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Page/PageModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Page/PageModuleCest.php
index 5fe4d399a482..e2c786888dee 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Page/PageModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Page/PageModuleCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Page;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * This testcase is used to check if the expected information is found when
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Scheduler/TasksCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Scheduler/TasksCest.php
index 7355908c8858..b86034d17c45 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Scheduler/TasksCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Scheduler/TasksCest.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Scheduler;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\ModalDialog;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\ModalDialog;
 
 /**
  * Scheduler task tests
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php
index 755b2ca68a88..74bfd3bec450 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Template;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Template tests
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
index d3146eae3f58..7ddf51823560 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
  */
 
 use Codeception\Scenario;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\ModalDialog;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\ModalDialog;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
 
 /**
  * Test for the "Bookmark" functionality
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/FlushCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/FlushCest.php
index 29e72dfbce5d..6bd61961bdec 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/FlushCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/FlushCest.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
 
 /**
  * Tests for the flush module in the topbar
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
index 816ea19bd4c2..4d9fab98f19c 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
 
 /**
  * Tests for the help module in the topbar
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
index f0a7618c360b..862cc8485546 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Acceptance test for the TYPO3 logo in the topbar
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/ModuleMenuButtonCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/ModuleMenuButtonCest.php
index 9d80510d8993..0e469e49c0ad 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/ModuleMenuButtonCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/ModuleMenuButtonCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\core\Tests\Acceptance\Backend\Topbar;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Acceptance test for the menu button in the topbar
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/NavigationComponentTreeCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/NavigationComponentTreeCest.php
index ba6ab3b32a47..103d5e1e990c 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/NavigationComponentTreeCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/NavigationComponentTreeCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Acceptance test for the Navigation Component Tree
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SearchCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SearchCest.php
index 0b7564c49379..4dfd91d15e46 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SearchCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SearchCest.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Support\Helper\Topbar;
 
 /**
  * Test the search module in the top bar
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php
index f4b0d175e61d..ed323303c6e3 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
+use TYPO3\Components\TestingFramework\Core\Acceptance\Step\Backend\Admin;
 
 /**
  * Topbar username and avatar module tests.
diff --git a/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php
index c955e2cdaad8..019e2cc42d59 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class Typo3DatabaseBackendTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Functional/Cache/Frontend/VariableFrontendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Frontend/VariableFrontendTest.php
index f8a37d631ca8..40d066286512 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class VariableFrontendTest extends \TYPO3\Components\TestingFramework\Core\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 18e38301e0fb..0c1732c258a5 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class CategoryCollectionTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var CategoryCollection
diff --git a/typo3/sysext/core/Tests/Functional/Collection/RecordCollectionRepositoryTest.php b/typo3/sysext/core/Tests/Functional/Collection/RecordCollectionRepositoryTest.php
index 228171c51ad1..12b70772dfbd 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class RecordCollectionRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 66f97e02441b..5a8d3cc0556f 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+abstract class AbstractDataHandlerActionTestCase extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     const VALUE_BackendUserId = 1;
 
@@ -364,34 +364,34 @@ abstract class AbstractDataHandlerActionTestCase extends \TYPO3\CMS\Components\T
     }
 
     /**
-     * @return \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\HasRecordConstraint
+     * @return \TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\HasRecordConstraint
      */
     protected function getRequestSectionHasRecordConstraint()
     {
-        return new \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\HasRecordConstraint();
+        return new \TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\HasRecordConstraint();
     }
 
     /**
-     * @return \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\DoesNotHaveRecordConstraint
+     * @return \TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\DoesNotHaveRecordConstraint
      */
     protected function getRequestSectionDoesNotHaveRecordConstraint()
     {
-        return new \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\DoesNotHaveRecordConstraint();
+        return new \TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\DoesNotHaveRecordConstraint();
     }
 
     /**
-     * @return \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\StructureHasRecordConstraint
+     * @return \TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\StructureHasRecordConstraint
      */
     protected function getRequestSectionStructureHasRecordConstraint()
     {
-        return new \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\StructureHasRecordConstraint();
+        return new \TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\StructureHasRecordConstraint();
     }
 
     /**
-     * @return \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\StructureDoesNotHaveRecordConstraint
+     * @return \TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\StructureDoesNotHaveRecordConstraint
      */
     protected function getRequestSectionStructureDoesNotHaveRecordConstraint()
     {
-        return new \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\StructureDoesNotHaveRecordConstraint();
+        return new \TYPO3\Components\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\StructureDoesNotHaveRecordConstraint();
     }
 }
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTest.php
index ea88987e9ceb..e088b1f50b94 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class GetUniqueTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/AbstractActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/AbstractActionTestCase.php
index 3ff620b532cc..5e7f6205e36c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/AbstractActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/AbstractActionTestCase.php
@@ -52,7 +52,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
         parent::setUp();
         $this->importScenarioDataSet('LiveDefaultPages');
         $this->importScenarioDataSet('LiveDefaultElements');
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
 
         $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts']);
         $this->backendUser->workspace = 0;
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Framework/ActionService.php b/typo3/sysext/core/Tests/Functional/DataHandling/Framework/ActionService.php
index e3aa943ba4bf..22b6d15527a2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Framework/ActionService.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Framework/ActionService.php
@@ -358,7 +358,7 @@ class ActionService
     /**
      * @param array $tableLiveUids
      * @param bool $throwException
-     * @throws \TYPO3\CMS\Components\TestingFramework\Core\Exception
+     * @throws \TYPO3\Components\TestingFramework\Core\Exception
      */
     public function publishRecords(array $tableLiveUids, $throwException = true)
     {
@@ -368,7 +368,7 @@ class ActionService
                 $versionedUid = $this->getVersionedId($tableName, $liveUid);
                 if (empty($versionedUid)) {
                     if ($throwException) {
-                        throw new \TYPO3\CMS\Components\TestingFramework\Core\Exception('Versioned UID could not be determined', 1476049592);
+                        throw new \TYPO3\Components\TestingFramework\Core\Exception('Versioned UID could not be determined', 1476049592);
                     } else {
                         continue;
                     }
diff --git a/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php b/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php
index 4d4d17ab0f53..f764c8fadf3e 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\CMS\Components\TestingFramework\Core\AccessibleObjectInterface;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Core\Database\DatabaseConnection;
 
 /**
  * Test case for \TYPO3\CMS\Core\Database\DatabaseConnection
  */
-class DatabaseConnectionTest extends \TYPO3\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class DatabaseConnectionTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var DatabaseConnection
diff --git a/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php
index a4df3ab45e62..197112a3c312 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class PreparedStatementTest extends \TYPO3\Components\TestingFramework\Core\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 40f6b1f69273..d6e25cdef16b 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class SchemaMigratorTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var SqlReader
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/AdditionalConfiguration.php b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/AdditionalConfiguration.php
index 772b5042a12d..c9c61e80cf50 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/AdditionalConfiguration.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/AdditionalConfiguration.php
@@ -12,7 +12,7 @@ $GLOBALS['TYPO3_CONF_VARS']['FE']['debug'] = false;
 // Register hooks for frontend test
 if (TYPO3_MODE === 'FE') {
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['initFEuser']['FunctionalTest'] =
-        \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Hook\FrontendUserHandler::class . '->initialize';
+        \TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Hook\FrontendUserHandler::class . '->initialize';
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['postBeUser']['FunctionalTest'] =
-        \TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Hook\BackendUserHandler::class . '->initialize';
+        \TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Hook\BackendUserHandler::class . '->initialize';
 }
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts
index 76d1db2fcbde..b4c1a242b37e 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts
@@ -10,7 +10,7 @@ page {
 			pluginName = Irre
 			vendorName = OliverHader
 		}
-		stdWrap.postUserFunc = TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
+		stdWrap.postUserFunc = TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
 		stdWrap.postUserFunc.as = Extbase
 	}
 }
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts
index e6f2fb8ca3bb..bd714253b8b2 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts
@@ -33,7 +33,7 @@ lib.watcherDataObject {
 	1 = LOAD_REGISTER
 	1.watcher.dataWrap = |
 	2 = USER
-	2.userFunc = TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
+	2.userFunc = TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
 	99 = RESTORE_REGISTER
 }
 
@@ -42,7 +42,7 @@ lib.watcherFileObject {
 	1 = LOAD_REGISTER
 	1.watcher.dataWrap = |
 	2 = USER
-	2.userFunc = TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Collector->addFileData
+	2.userFunc = TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Collector->addFileData
 	99 = RESTORE_REGISTER
 }
 
@@ -53,7 +53,7 @@ page {
 		1 = LOAD_REGISTER
 		1.watcher.dataWrap = pages:{field:uid}
 		2 = USER
-		2.userFunc = TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
+		2.userFunc = TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
 		10 = CONTENT
 		10 {
 			stdWrap.required = 1
@@ -219,10 +219,10 @@ page {
 				}
 			}
 		}
-		stdWrap.postUserFunc = TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Collector->attachSection
+		stdWrap.postUserFunc = TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Collector->attachSection
 		stdWrap.postUserFunc.as = Default
 	}
-	stdWrap.postUserFunc = TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
+	stdWrap.postUserFunc = TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
 }
 
 [globalVar = GP:L = 1]
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/request.tpl b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/request.tpl
index f8567da8f2c0..ba8c9056daae 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/request.tpl
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/request.tpl
@@ -1,5 +1,5 @@
 <?php
-require '{originalRoot}components/testing_framework/core/Functional/Framework/Frontend/RequestBootstrap.php';
-\TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\RequestBootstrap::setGlobalVariables({arguments});
-\TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\RequestBootstrap::executeAndOutput();
+require '{originalRoot}components/testing_framework/Classes/Core/Functional/Framework/Frontend/RequestBootstrap.php';
+\TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\RequestBootstrap::setGlobalVariables({arguments});
+\TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\RequestBootstrap::executeAndOutput();
 ?>
diff --git a/typo3/sysext/core/Tests/Functional/Log/Writer/DatabaseWriterTest.php b/typo3/sysext/core/Tests/Functional/Log/Writer/DatabaseWriterTest.php
index d56a9108a58d..de2f34650a5f 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class DatabaseWriterTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Functional/Messaging/FlashMessageQueueTest.php b/typo3/sysext/core/Tests/Functional/Messaging/FlashMessageQueueTest.php
index b8f6c84fa2f2..f848b992fc61 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FlashMessageQueueTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
index 6c43aabf090f..51d2797d2fa8 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class PageRendererTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Functional/RegistryTest.php b/typo3/sysext/core/Tests/Functional/RegistryTest.php
index 1a773a3f7877..fc239c85912c 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class RegistryTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
index b393be53f461..148148889568 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class ResourceStorageTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     protected function tearDown()
     {
@@ -40,7 +40,7 @@ class ResourceStorageTest extends \TYPO3\CMS\Components\TestingFramework\Core\Fu
      */
     public function getNestedProcessingFolderTest()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
         $this->setUpBackendUserFromFixture(1);
         $subject = (new StorageRepository())->findByUid(1);
         $subject->setEvaluatePermissions(false);
@@ -76,7 +76,7 @@ class ResourceStorageTest extends \TYPO3\CMS\Components\TestingFramework\Core\Fu
      */
     public function isWithinFileMountBoundariesRespectsReadOnlyFileMounts($targetDirectory, $fileMountFolder, $isFileMountReadOnly, $checkWriteAccess, $expectedResult)
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
         $fileName = 'bar.txt';
         $this->setUpBackendUserFromFixture(1);
         GeneralUtility::mkdir_deep(PATH_site . 'fileadmin/_processed_');
@@ -152,7 +152,7 @@ class ResourceStorageTest extends \TYPO3\CMS\Components\TestingFramework\Core\Fu
      */
     public function getProcessingRootFolderTest()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
         $this->setUpBackendUserFromFixture(1);
 
         $subject = (new StorageRepository())->findByUid(1);
@@ -167,7 +167,7 @@ class ResourceStorageTest extends \TYPO3\CMS\Components\TestingFramework\Core\Fu
     public function getRoleReturnsDefaultForRegularFolders()
     {
         $folderIdentifier = $this->getUniqueId();
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
         $this->setUpBackendUserFromFixture(1);
 
         $subject = (new StorageRepository())->findByUid(1);
@@ -183,7 +183,7 @@ class ResourceStorageTest extends \TYPO3\CMS\Components\TestingFramework\Core\Fu
      */
     public function replaceFileFailsIfLocalFileDoesNotExist()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
         $this->setUpBackendUserFromFixture(1);
         $subject = (new StorageRepository())->findByUid(1);
 
@@ -202,7 +202,7 @@ class ResourceStorageTest extends \TYPO3\CMS\Components\TestingFramework\Core\Fu
      */
     public function createFolderThrowsExceptionIfParentFolderDoesNotExist()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/sys_file_storage.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
         $this->setUpBackendUserFromFixture(1);
         $subject = (new StorageRepository())->findByUid(1);
 
diff --git a/typo3/sysext/core/Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php
index 8dfec4b68874..4d4c6cd224c5 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class BackendGroupsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 98431e9f81d7..6e588f0ba7ae 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class BackendUsersVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 1017b46064d8..7a0db3cf3718 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class CategoryVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 3f0f810a0bac..652871f7f14e 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class CollectionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 f3647631061c..92b45ba14ba4 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FileCollectionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 64cddcf2b217..d9953c99705a 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FileMetadataVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 24ec7d367fa5..31f90756089a 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FileStorageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 a4f50fe62102..26f73e623a1c 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FilemountsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 8207471b9a2e..4db21091c2cc 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class LanguageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 8b7b734427f9..08f53af3a1e9 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class NewsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 c29b3ed8efaa..6d6c31542bbd 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class PagesVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 ceec5bf97d70..352d0fc3a21e 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class TypoScriptParserTest extends \TYPO3\Components\TestingFramework\Core\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 3c106d88e220..51092fb63cb7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IntegrityTest extends \TYPO3\Components\TestingFramework\Core\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 8edfa203ef78..95fc0eef18fa 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RemoveXSSTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
index f832335f3520..f79311f8389b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractUserAuthenticationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
index 901802aaab07..5d13437398ed 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUserAuthenticationTest extends \TYPO3\Components\TestingFramework\Core\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 a52c59a37103..e1aef87171c5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractBackendTest extends \TYPO3\Components\TestingFramework\Core\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 ad3c815cfbd3..a73f37f44d8c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ApcBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Sets up this testcase
@@ -303,7 +303,7 @@ class ApcBackendTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTes
      * Sets up the APC backend used for testing
      *
      * @param bool $accessible TRUE if backend should be encapsulated in accessible proxy otherwise FALSE.
-     * @return \TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|ApcBackend
+     * @return \TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|ApcBackend
      */
     protected function setUpBackend($accessible = false)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
index 8e08049d092b..900bc174c424 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface;
+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;
@@ -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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ApcuBackendTest extends \TYPO3\Components\TestingFramework\Core\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 42bd66d9d0da..ddb2587f9245 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileBackendTest extends \TYPO3\Components\TestingFramework\Core\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 93ef83c3ecf5..0e9a907da9cc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MemcachedBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Sets up this testcase
@@ -293,7 +293,7 @@ class MemcachedBackendTest extends \TYPO3\CMS\Components\TestingFramework\Core\U
      *
      * @param array $backendOptions Options for the memcache backend
      * @param bool $accessible TRUE if backend should be encapsulated in accessible proxy otherwise FALSE.
-     * @return \TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|MemcachedBackend
+     * @return \TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|MemcachedBackend
      */
     protected function setUpBackend(array $backendOptions = [], $accessible = false)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
index da496898c484..c002084c247f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PdoBackendTest extends \TYPO3\Components\TestingFramework\Core\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 3159ff304ba7..883aec472cb2 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RedisBackendTest extends \TYPO3\Components\TestingFramework\Core\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 6f22b289b625..4d2f3b119041 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TransientMemoryBackendTest extends \TYPO3\Components\TestingFramework\Core\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 9f77a77cb879..5e23570b2d43 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class Typo3DatabaseBackendTest extends \TYPO3\Components\TestingFramework\Core\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 3c2a9a483354..7ab2ae2163cd 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class WincacheBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Sets up this testcase
@@ -265,7 +265,7 @@ class WincacheBackendTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
      * Sets up the WinCache backend used for testing
      *
      * @param bool $accessible TRUE if backend should be encapsulated in accessible proxy otherwise FALSE.
-     * @return \TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|WincacheBackend
+     * @return \TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|WincacheBackend
      */
     protected function setUpBackend($accessible = false)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php b/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php
index 1ca8f78eaea2..01b3641727be 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CacheFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
index 635c4d124489..8d0b5f6888b2 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CacheManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -316,7 +316,7 @@ class CacheManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function getCacheCreatesCacheInstanceWithFallbackToDefaultFrontend()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
+        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
         $manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
         $cacheIdentifier = $this->getUniqueId('Test');
         $configuration = [
@@ -342,7 +342,7 @@ class CacheManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function getCacheCreatesCacheInstanceWithFallbackToDefaultBackend()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
+        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
         $manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
         $cacheIdentifier = $this->getUniqueId('Test');
         $configuration = [
@@ -426,7 +426,7 @@ class CacheManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function flushCachesInGroupByTagsWithEmptyTagsArrayDoesNotFlushCaches()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
+        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
         $manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
         $cacheIdentifier = 'aTest';
 
@@ -462,7 +462,7 @@ class CacheManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function flushCachesInGroupByTagsDeletesByTag()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
+        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
         $manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
         $cacheIdentifier = 'aTest';
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
index b089fb64ae3a..cb9dd2b9610b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractFrontendTest extends \TYPO3\Components\TestingFramework\Core\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 0ac36a3492b4..cac593b8583f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PhpFrontendTest extends \TYPO3\Components\TestingFramework\Core\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 e7ee1b7c1858..f32cf86f6f6b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class StringFrontendTest extends \TYPO3\Components\TestingFramework\Core\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 c73277d8141a..34ac9c9d37fe 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class VariableFrontendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php b/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
index e98516f596da..97bcb374de36 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CategoryRegistryTest extends \TYPO3\Components\TestingFramework\Core\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 c6071e9ebd44..8f858b033e08 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CategoryCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php b/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
index c0a7cab1d6f6..09909f1797ae 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CharsetConverterTest extends \TYPO3\Components\TestingFramework\Core\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 fce0c5d40e52..703e62b42b9e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject
@@ -367,7 +367,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Co
         if (function_exists('posix_getegid') && posix_getegid() === 0) {
             $this->markTestSkipped('Test skipped if run on linux as root');
         }
-        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, ['dummy']);
 
         $file = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
@@ -391,7 +391,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function canWriteConfigurationReturnsTrueIfDirectoryAndFilesAreWritable()
     {
-        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, ['dummy']);
 
         $directory = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
@@ -464,7 +464,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Co
     {
         $this->expectException(\RuntimeException::class);
 
-        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, ['dummy']);
 
         $file = 'typo3temp/var/tests/' . $this->getUniqueId('test_');
@@ -481,7 +481,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function createLocalConfigurationFromFactoryConfigurationWritesContentFromFactoryFile()
     {
-        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, ['writeLocalConfiguration']);
         $subject->_set('localConfigurationFile', 'typo3temp/var/tests/' . $this->getUniqueId('dummy_'));
 
@@ -513,7 +513,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function createLocalConfigurationFromFactoryConfigurationMergesConfigurationWithAdditionalFactoryFile()
     {
-        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, ['writeLocalConfiguration']);
         $subject->_set('localConfigurationFile', 'typo3temp/var/tests/' . $this->getUniqueId('dummy_'));
 
@@ -556,7 +556,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function isValidLocalConfigurationPathAcceptsWhitelistedPath()
     {
-        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, ['dummy']);
         $subject->_set('whiteListedLocalConfigurationPaths', ['foo/bar']);
         $this->assertTrue($subject->_call('isValidLocalConfigurationPath', 'foo/bar/baz'));
@@ -567,7 +567,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function isValidLocalConfigurationPathDeniesNotWhitelistedPath()
     {
-        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, ['dummy']);
         $subject->_set('whiteListedLocalConfigurationPaths', ['foo/bar']);
         $this->assertFalse($subject->_call('isValidLocalConfigurationPath', 'bar/baz'));
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
index 0026a06a40dd..0db3d567e80d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FlexFormToolsTest extends \TYPO3\Components\TestingFramework\Core\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 68ef4fdd039c..edb0393e538e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class YamlFileLoaderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Generic method to check if the load method returns an array from a YAML file
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/RichtextTest.php b/typo3/sysext/core/Tests/Unit/Configuration/RichtextTest.php
index 90c72cb30fa4..58244dab719b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RichtextTest extends \TYPO3\Components\TestingFramework\Core\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 a223c91264d6..cb5ddafd55f3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\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 51bcc1772477..3611ffa1d24a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ApplicationContextTest extends \TYPO3\Components\TestingFramework\Core\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 d495a0d773d5..06972fd4c6ae 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ClassLoadingInformationGeneratorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php b/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
index 005746e2404f..1168c90d1d6a 100644
--- a/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Core\Tests\Unit\Core;
 /**
  * Testcase
  */
-class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class SystemEnvironmentBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject = null;
 
diff --git a/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php b/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php
index 60085432a2d2..4115cdd07d0c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RandomTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
index 9f5a7c963fe0..d4c7413ca74b 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\DataHandler;
  */
 
 use Prophecy\Argument;
-use TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface;
+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;
@@ -27,7 +27,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class DataHandlerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class DataHandlerTest extends \TYPO3\Components\TestingFramework\Core\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 283810f0a490..caa9c523f7a0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConnectionPoolTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
index f5f84cad9d81..fbbbd285fa1f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConnectionTest extends \TYPO3\Components\TestingFramework\Core\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 dca488995eea..476754af31f5 100644
--- a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Database;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Core\Database\DatabaseConnection;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * Test case
  *
  */
-class DatabaseConnectionTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseConnectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var DatabaseConnection
diff --git a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
index 3917fc44dd4d..9a843a9da63b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PreparedStatementTest extends \TYPO3\Components\TestingFramework\Core\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 8f6451537d19..43451caf06e3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BulkInsertTest extends \TYPO3\Components\TestingFramework\Core\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 984522808e91..3236d5e58f2e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExpressionBuilderTest extends \TYPO3\Components\TestingFramework\Core\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 dd9517c69295..c1db965522f4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class QueryBuilderTest extends \TYPO3\Components\TestingFramework\Core\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 ca3094223829..62999a9ac6e9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class QueryHelperTest extends \TYPO3\Components\TestingFramework\Core\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 9f9210b32daf..f2f37d42b2d4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractRestrictionTestCase extends \TYPO3\Components\TestingFramework\Core\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 0e3428e30a57..c28544ea7c76 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RelationHandlerTest extends \TYPO3\Components\TestingFramework\Core\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 cedd532f0e53..4444303435f0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConnectionMigratorTest extends \TYPO3\Components\TestingFramework\Core\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 00d137d957b8..aaeb6544a20c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SchemaColumnDefinitionListenerTest extends \TYPO3\Components\TestingFramework\Core\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 b360549f18e2..d34ee2c55001 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\CMS\Components\TestingFramework\Core\UnitTestCase
+abstract class AbstractDataTypeBaseTestCase extends \TYPO3\Components\TestingFramework\Core\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 9c0694c19365..dc916b0e86c0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ColumnDefinitionAttributesTest extends \TYPO3\Components\TestingFramework\Core\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 785af8c751ce..ac54e7a4c3d7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ColumnDefinitionItemTest extends \TYPO3\Components\TestingFramework\Core\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 45b67c3667e0..d1c39ca1dc69 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CreateTableFragmentTest extends \TYPO3\Components\TestingFramework\Core\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 d776651d78ae..06cce8c3cef2 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ForeignKeyDefinitionTest extends \TYPO3\Components\TestingFramework\Core\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 2dafd475ce69..fbf8d1716944 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IndexDefinitionTest extends \TYPO3\Components\TestingFramework\Core\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 17ac51311347..8f289290b55d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ReferenceDefinitionTest extends \TYPO3\Components\TestingFramework\Core\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 db1dc980d846..50794e885a9d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TableBuilderTest extends \TYPO3\Components\TestingFramework\Core\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 516e6a006ed9..c9a7ea118b4d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TableOptionsTest extends \TYPO3\Components\TestingFramework\Core\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 479ebb39ed9a..643967aa068d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SqlReaderTest extends \TYPO3\Components\TestingFramework\Core\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 006be492c77b..d99fdaccd0e5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EnumTypeTest extends \TYPO3\Components\TestingFramework\Core\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 842926a5e829..dffee9888ad4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SetTypeTest extends \TYPO3\Components\TestingFramework\Core\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 672e03563d2c..642be17cb2e0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class JavaScriptEncoderTest extends \TYPO3\Components\TestingFramework\Core\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 bd2994b61a87..0d0afeb1b57f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DebugExceptionHandlerTest extends \TYPO3\Components\TestingFramework\Core\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 afd62f201a07..037c3cf1b697 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ProductionExceptionHandlerTest extends \TYPO3\Components\TestingFramework\Core\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 5c34b21fa047..3686ffebff5a 100644
--- a/typo3/sysext/core/Tests/Unit/FileStreamWrapperTest.php
+++ b/typo3/sysext/core/Tests/Unit/FileStreamWrapperTest.php
@@ -15,12 +15,12 @@ namespace TYPO3\CMS\Core\Tests\Unit;
  */
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
-use TYPO3\CMS\Components\TestingFramework\Core\FileStreamWrapper;
+use TYPO3\Components\TestingFramework\Core\FileStreamWrapper;
 
 /**
  * Test case for \TYPO3\CMS\Core\Tests\Unit\FileStreamWrapper
  */
-class FileStreamWrapperTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileStreamWrapperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
index dfb41536e40d..03dc6c95dfa4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\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 f7e53d9d400d..a3f59ebb1b4d 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
@@ -21,10 +21,10 @@ use TYPO3\CMS\Core\Registry;
 /**
  * Testcase
  */
-class BackendFormProtectionTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\FormProtection\BackendFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\FormProtection\BackendFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
index bbad3d3af292..4e97f000d493 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormProtectionFactoryTest extends \TYPO3\Components\TestingFramework\Core\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 6782266ccc66..ade8f80bbc54 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Core\Tests\Unit\FormProtection;
 /**
  * Testcase
  */
-class InstallToolFormProtectionTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class InstallToolFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
diff --git a/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php b/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
index 5777294c4393..c7f166d6ecbe 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class HtmlParserTest extends \TYPO3\Components\TestingFramework\Core\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 ffe8fe6e35b1..7e1da7cc43d1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RteHtmlParserTest extends \TYPO3\Components\TestingFramework\Core\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 11a90e9b304e..804645066270 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MessageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var Stream
diff --git a/typo3/sysext/core/Tests/Unit/Http/RequestTest.php b/typo3/sysext/core/Tests/Unit/Http/RequestTest.php
index 6f36799bfcec..ef9fdb26c6c6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var Request
diff --git a/typo3/sysext/core/Tests/Unit/Http/ResponseTest.php b/typo3/sysext/core/Tests/Unit/Http/ResponseTest.php
index efcbb0f45c07..16352e0c7931 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ResponseTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var Response
diff --git a/typo3/sysext/core/Tests/Unit/Http/ServerRequestFactoryTest.php b/typo3/sysext/core/Tests/Unit/Http/ServerRequestFactoryTest.php
index 7430a9ece512..ab4112bf4345 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ServerRequestFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Set up
diff --git a/typo3/sysext/core/Tests/Unit/Http/ServerRequestTest.php b/typo3/sysext/core/Tests/Unit/Http/ServerRequestTest.php
index e7eaae198d0d..3b031039722d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ServerRequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var ServerRequest
diff --git a/typo3/sysext/core/Tests/Unit/Http/StreamTest.php b/typo3/sysext/core/Tests/Unit/Http/StreamTest.php
index 6f626a6e3f2d..c5ecdd80460b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class StreamTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var Stream
diff --git a/typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php b/typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php
index 70a1c7f33321..21dfbbe1e101 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class UploadedFileTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     protected $tmpFile;
 
diff --git a/typo3/sysext/core/Tests/Unit/Http/UriTest.php b/typo3/sysext/core/Tests/Unit/Http/UriTest.php
index 3e70df053bc6..1bfa232dea63 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class UriTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php b/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php
index bc31bc73a53c..fc59570a302d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DimensionTest extends \TYPO3\Components\TestingFramework\Core\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 960c207e4ad4..a4606b148c43 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class GraphicalFunctionsTest extends \TYPO3\Components\TestingFramework\Core\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 9af74eea923b..97222bd0ef69 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IconFactoryTest extends \TYPO3\Components\TestingFramework\Core\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 3ef0563f706d..2ee4a5eaa740 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BitmapIconProviderTest extends \TYPO3\Components\TestingFramework\Core\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 88402ac3456e..b08f6581e6f6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FontawesomeIconProviderTest extends \TYPO3\Components\TestingFramework\Core\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 a17f5b8b5317..f12ddbd0b7c1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SvgIconProviderTest extends \TYPO3\Components\TestingFramework\Core\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 1171b630e5fa..82d1407346ea 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IconRegistryTest extends \TYPO3\Components\TestingFramework\Core\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 1e7b72bf57a7..e8eeff5461d5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IconTest extends \TYPO3\Components\TestingFramework\Core\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 f34bf7e6c379..a6a127ea9f68 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EmailLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
index 0779628f0d59..f2b24b585387 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
@@ -85,7 +85,7 @@ class FileLinkHandlerTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
         $factory->expects($this->any())->method('getFileObject')->with($expected['file'])->willReturn($fileObject);
         $expected['file'] = $fileObject;
 
-        /** @var FileLinkHandler|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var FileLinkHandler|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(FileLinkHandler::class, ['dummy']);
         $subject->_set('resourceFactory', $factory);
         $this->assertEquals($expected, $subject->resolveHandlerData($input));
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
index 20b6fa4ac39b..91ec1c06e30c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FolderLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
@@ -86,7 +86,7 @@ class FolderLinkHandlerTest extends \TYPO3\CMS\Components\TestingFramework\Core\
             ->willReturn($folderObject);
         $expected['folder'] = $folderObject;
 
-        /** @var FolderLinkHandler|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var FolderLinkHandler|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(FolderLinkHandler::class, ['dummy']);
         $subject->_set('resourceFactory', $factory);
         $this->assertEquals($expected, $subject->resolveHandlerData($input));
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
index 0b6e1a4e625c..5161d114ee2b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LegacyLinkNotationConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Data to resolve strings to arrays and vice versa, external, mail, page
@@ -217,7 +217,7 @@ class LegacyLinkNotationConverterTest extends \TYPO3\CMS\Components\TestingFrame
             $expected['folder'] = $folderObject;
         }
 
-        /** @var LegacyLinkNotationConverter|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var LegacyLinkNotationConverter|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(LegacyLinkNotationConverter::class, ['dummy']);
         $subject->_set('resourceFactory', $factory);
         $this->assertEquals($expected, $subject->resolve($input));
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/LinkServiceTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/LinkServiceTest.php
index f76f2b1a1b85..58208329bb51 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LinkServiceTest extends \TYPO3\Components\TestingFramework\Core\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 6ca06a79e7b0..49ab7d2c8ff8 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PageLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/UrlLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/UrlLinkHandlerTest.php
index cf5019b9775f..f569de189279 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class UrlLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php b/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php
index 4384c1a053c1..399e93c38dfa 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LocalesTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var Locales
diff --git a/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php b/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
index 03ad75b3387f..010784a6f7d4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LocalizationFactoryTest extends \TYPO3\Components\TestingFramework\Core\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 3b52a6a1b8d7..157113bd8810 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LocallangXmlParserTest extends \TYPO3\Components\TestingFramework\Core\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 cd4081012c46..68ff67a57397 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class XliffParserTest extends \TYPO3\Components\TestingFramework\Core\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 4d945ebceeeb..5411c7f04e7a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php b/typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php
index e6559922c72d..d107eca3cf00 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php
@@ -24,10 +24,10 @@ use TYPO3\CMS\Core\Tests\Unit\Locking\Fixtures\DummyLock;
 /**
  * Testcase for \TYPO3\CMS\Core\Locking\LockFactory
  */
-class LockFactoryTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class LockFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var LockFactory|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var LockFactory|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $mockFactory;
 
diff --git a/typo3/sysext/core/Tests/Unit/Locking/SemaphoreLockStrategyTest.php b/typo3/sysext/core/Tests/Unit/Locking/SemaphoreLockStrategyTest.php
index 35ba127c2e74..b30e88d31a2a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SemaphoreLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\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 d08e9ef22db9..67c0c16f60ef 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SimpleLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -50,7 +50,7 @@ class SimpleLockStrategyTest extends \TYPO3\CMS\Components\TestingFramework\Core
             $this->markTestSkipped('Test not available on Windows.');
         }
         // Use a very high id to be unique
-        /** @var SimpleLockStrategy|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $lock */
+        /** @var SimpleLockStrategy|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $lock */
         $lock = $this->getAccessibleMock(SimpleLockStrategy::class, ['dummy'], ['999999999']);
 
         $pathOfLockFile = $lock->_get('filePath');
@@ -70,7 +70,7 @@ class SimpleLockStrategyTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function releaseRemovesLockfileInTypo3TempLocks()
     {
-        /** @var SimpleLockStrategy|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $lock */
+        /** @var SimpleLockStrategy|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $lock */
         $lock = $this->getAccessibleMock(SimpleLockStrategy::class, ['dummy'], ['999999999']);
 
         $pathOfLockFile = $lock->_get('filePath');
@@ -108,7 +108,7 @@ class SimpleLockStrategyTest extends \TYPO3\CMS\Components\TestingFramework\Core
             $this->markTestIncomplete('releaseDoesNotRemoveFilesNotWithinTypo3TempLocksDirectory() skipped: Test file could not be created');
         }
         // Create instance, set lock file to invalid path
-        /** @var SimpleLockStrategy|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $lock */
+        /** @var SimpleLockStrategy|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $lock */
         $lock = $this->getAccessibleMock(SimpleLockStrategy::class, ['dummy'], ['999999999']);
         $lock->_set('filePath', $file);
         $lock->_set('isAcquired', true);
diff --git a/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php b/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php
index caa0d2333350..67e5dba7f268 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LogLevelTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php b/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php
index 569969329872..97c7fd315f76 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LogManagerTest extends \TYPO3\Components\TestingFramework\Core\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 6453496a9902..12b161dee346 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LogRecordTest extends \TYPO3\Components\TestingFramework\Core\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 a5d5e3cebadc..8e9796255869 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LoggerTest extends \TYPO3\Components\TestingFramework\Core\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 b6979b9015f9..2a0cc10b9604 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractMemoryTest extends \TYPO3\Components\TestingFramework\Core\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 48a8b36f9b16..0bd7afc7f782 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractProcessorTest extends \TYPO3\Components\TestingFramework\Core\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 13513aa6d0c9..32c1204cf723 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IntrospectionProcessorTest extends \TYPO3\Components\TestingFramework\Core\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 48939de03a39..d05b42309be3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MemoryPeakUsageProcessorTest extends \TYPO3\Components\TestingFramework\Core\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 38473be7e934..3b12f712861f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MemoryUsageProcessorTest extends \TYPO3\Components\TestingFramework\Core\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 58e02ff87e60..e4a6c8b257f1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class WebProcessorTest extends \TYPO3\Components\TestingFramework\Core\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 0f6edd39066e..8f86fbcf5f58 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractWriterTest extends \TYPO3\Components\TestingFramework\Core\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 58c52363c484..a3371a1a9642 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseWriterTest extends \TYPO3\Components\TestingFramework\Core\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 86943803d810..7517fc0e9211 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileWriterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var string
diff --git a/typo3/sysext/core/Tests/Unit/Mail/MailMessageTest.php b/typo3/sysext/core/Tests/Unit/Mail/MailMessageTest.php
index b5bafb551d63..3988d5703a86 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MailMessageTest extends \TYPO3\Components\TestingFramework\Core\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 c240dba9cb3e..13101e1a055c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MailerTest extends \TYPO3\Components\TestingFramework\Core\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 decb225e7b9e..e0c7eff850df 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageRendererResolverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageRendererResolverTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase;
+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;
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
index 58ef3c8875e9..c295f90de839 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
 /**
  * Test case
  */
-class FlashMessageServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class FlashMessageServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\Messaging\FlashMessageService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\Messaging\FlashMessageService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $flashMessageService;
 
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php
index 14b26a2c934d..4081d4d4c122 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase;
+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;
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php
index d2f3ba691c8f..b8632b7372ba 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase;
+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;
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php
index f363fe0c9b04..056ab1e9c5ff 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase;
+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;
diff --git a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
index b2ca7df1357e..20410537d5b9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TcaMigrationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Package/DependencyResolverTest.php b/typo3/sysext/core/Tests/Unit/Package/DependencyResolverTest.php
index 2af3d6ed78d2..4864c6d8de3c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DependencyResolverTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -31,7 +31,7 @@ class DependencyResolverTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function buildDependencyGraphBuildsCorrectGraph(array $unsortedPackageStatesConfiguration, array $frameworkPackageKeys, array $expectedGraph)
     {
-        /** @var DependencyResolver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyResolver */
+        /** @var DependencyResolver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyResolver */
         $dependencyResolver = $this->getAccessibleMock(DependencyResolver::class, ['findFrameworkPackages']);
         $dependencyResolver->injectDependencyOrderingService(new DependencyOrderingService());
         $dependencyResolver->expects($this->any())->method('findFrameworkPackages')->willReturn($frameworkPackageKeys);
@@ -49,7 +49,7 @@ class DependencyResolverTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function sortPackageStatesConfigurationByDependencyMakesSureThatDependantPackagesAreStandingBeforeAPackageInTheInternalPackagesAndPackagesConfigurationArrays($unsortedPackageStatesConfiguration, $frameworkPackageKeys, $expectedSortedPackageKeys)
     {
-        /** @var DependencyResolver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyResolver */
+        /** @var DependencyResolver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyResolver */
         $dependencyResolver = $this->getAccessibleMock(DependencyResolver::class, ['findFrameworkPackages']);
         $dependencyResolver->injectDependencyOrderingService(new DependencyOrderingService());
         $dependencyResolver->expects($this->any())->method('findFrameworkPackages')->willReturn($frameworkPackageKeys);
@@ -75,7 +75,7 @@ class DependencyResolverTest extends \TYPO3\CMS\Components\TestingFramework\Core
         $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionCode(1381960494);
 
-        /** @var DependencyResolver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyResolver */
+        /** @var DependencyResolver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyResolver */
         $dependencyResolver = $this->getAccessibleMock(DependencyResolver::class, ['findFrameworkPackages']);
         $dependencyResolver->injectDependencyOrderingService(new DependencyOrderingService());
         $dependencyResolver->expects($this->any())->method('findFrameworkPackages')->willReturn([]);
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
index 8aaff53f2879..6cac1d555ab0 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
@@ -24,10 +24,10 @@ use TYPO3\CMS\Core\Package\PackageManager;
  * Testcase for the default package manager
  *
  */
-class PackageManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class PackageManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $packageManager
+     * @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $packageManager
      */
     protected $packageManager;
 
@@ -160,7 +160,7 @@ class PackageManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
             file_put_contents($packagePath . 'ext_emconf.php', '<?php' . LF . '$EM_CONF[$_EXTKEY] = [];');
         }
 
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $packageManager */
+        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $packageManager */
         $packageManager = $this->getAccessibleMock(PackageManager::class, ['dummy']);
         $packageManager->_set('packagesBasePaths', $packagePaths);
         $packageManager->_set('packagesBasePath', 'vfs://Test/Packages/');
@@ -212,7 +212,7 @@ class PackageManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
             $packagePaths[] = $packagePath;
         }
 
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $packageManager */
+        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $packageManager */
         $packageManager = $this->getAccessibleMock(PackageManager::class, ['sortAndSavePackageStates']);
         $packageManager->_set('packagesBasePaths', $packagePaths);
         $packageManager->_set('packagesBasePath', 'vfs://Test/Packages/');
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
index efaf36007c2b..2b892d3712f9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PackageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      */
diff --git a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
index b5e1baa829d5..1f472978e153 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PageRendererTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -46,7 +46,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
         $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionCode(1341505305);
 
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['dummy'], [], '', false);
         $subject->_set('availableLocalJqueryVersions', ['1.1.1']);
         $subject->loadJquery('2.2.2');
@@ -60,7 +60,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
         $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionCode(1341571604);
 
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['dummy'], [], '', false);
         $subject->loadJquery(null, null, '12sd.12fsd');
         $subject->render();
@@ -71,7 +71,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function addBodyContentAddsContent()
     {
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['dummy'], [], '', false);
         $expectedReturnValue = 'ABCDE';
         $subject->addBodyContent('A');
@@ -88,7 +88,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function addInlineLanguageLabelFileSetsInlineLanguageLabelFiles()
     {
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['dummy'], [], '', false);
         $fileReference = $this->getUniqueId('file_');
         $selectionPrefix = $this->getUniqueId('prefix_');
@@ -113,7 +113,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function addInlineLanguageLabelFileSetsTwoDifferentInlineLanguageLabelFiles()
     {
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['dummy'], [], '', false);
         $fileReference1 = $this->getUniqueId('file1_');
         $selectionPrefix1 = $this->getUniqueId('prefix1_');
@@ -149,7 +149,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function addInlineLanguageLabelFileDoesNotSetSameLanguageFileTwice()
     {
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['dummy'], [], '', false);
         $fileReference = $this->getUniqueId('file2_');
         $selectionPrefix = $this->getUniqueId('prefix2_');
@@ -169,7 +169,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionCode(1284906026);
 
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['dummy'], [], '', false);
         $subject->_set('charSet', 'utf-8');
         $subject->_call('includeLanguageFileForInline', 'someLLFile.xml');
@@ -183,7 +183,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionCode(1284906026);
 
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['dummy'], [], '', false);
         $subject->_set('lang', 'default');
         $subject->_call('includeLanguageFileForInline', 'someLLFile.xml');
@@ -194,7 +194,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function includeLanguageFileForInlineDoesNotAddToInlineLanguageLabelsIfFileCouldNotBeRead()
     {
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['readLLfile'], [], '', false);
         $subject->_set('lang', 'default');
         $subject->_set('charSet', 'utf-8');
@@ -260,7 +260,7 @@ class PageRendererTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitT
      */
     public function includeLanguageFileForInlineAddsProcessesLabelsToInlineLanguageLabels($llFileContent, $selectionPrefix, $stripFromSelectionName, $expectation)
     {
-        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Core\Page\PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Page\PageRenderer::class, ['readLLfile'], [], '', false);
         $subject->_set('lang', 'default');
         $subject->_set('charSet', 'utf-8');
diff --git a/typo3/sysext/core/Tests/Unit/RegistryTest.php b/typo3/sysext/core/Tests/Unit/RegistryTest.php
index b110259eb866..284364601aa4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php b/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
index 2c0bd73d67d6..b17c7873a66f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractFileTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
index 0cd2d7c21019..b559df0cb440 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\CMS\Components\TestingFramework\Core\UnitTestCase
+abstract class BaseTestCase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var string
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractHierarchicalFilesystemDriverTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractHierarchicalFilesystemDriverTest.php
index 63442680d4f1..6fd6c3941c4b 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractHierarchicalFilesystemDriverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractHierarchicalFilesystemDriverTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase;
 class AbstractHierarchicalFilesystemDriverTest extends BaseTestCase
 {
     /**
-     * @var AbstractHierarchicalFilesystemDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var AbstractHierarchicalFilesystemDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject = null;
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
index 38ab3971ce73..bf0b1b75ea26 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DriverRegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Resource\Driver\DriverRegistry
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
index c59afc6e4e29..e623b4f8034b 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Driver;
 
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamWrapper;
-use TYPO3\CMS\Components\TestingFramework\Core\FileStreamWrapper;
+use TYPO3\Components\TestingFramework\Core\FileStreamWrapper;
 use TYPO3\CMS\Core\Resource\Exception\InvalidFileNameException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -167,7 +167,7 @@ class LocalDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase
      */
     public function createFolderRecursiveSanitizesFilename()
     {
-        /** @var \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $driver */
+        /** @var \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $driver */
         $driver = $this->createDriver([], ['sanitizeFilename']);
         $driver->expects($this->exactly(2))
             ->method('sanitizeFileName')
@@ -183,7 +183,7 @@ class LocalDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase
      */
     public function determineBaseUrlUrlEncodesUriParts()
     {
-        /** @var \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $driver */
+        /** @var \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $driver */
         $driver = $this->getAccessibleMock(\TYPO3\CMS\Core\Resource\Driver\LocalDriver::class, ['hasCapability'], [], '', false);
         $driver->expects($this->once())
             ->method('hasCapability')
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php b/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
index fa7a7ed48790..60973aea36a9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileReferenceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
@@ -40,7 +40,7 @@ class FileReferenceTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
     /**
      * @param array $fileReferenceProperties
      * @param array $originalFileProperties
-     * @return \TYPO3\CMS\Core\Resource\FileReference|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @return \TYPO3\CMS\Core\Resource\FileReference|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected function prepareFixture(array $fileReferenceProperties, array $originalFileProperties)
     {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FileTest.php b/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
index 8cbf6a5cc0f0..030f34c7b329 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileTest extends \TYPO3\Components\TestingFramework\Core\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 e4af90904485..15c6ec115e29 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileNameFilterTest extends \TYPO3\Components\TestingFramework\Core\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 4c56e62b6b34..6c117e6094bc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FolderTest extends \TYPO3\Components\TestingFramework\Core\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 be48d1767782..dfeb9653ba64 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtractorRegistryTest extends \TYPO3\Components\TestingFramework\Core\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 fa5c6c9a2937..9e0d475d4c3e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IndexerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php b/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
index 12285da6affb..74f33a28a25d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ProcessedFileTest extends \TYPO3\Components\TestingFramework\Core\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 2e04b5848cd8..d4d6cd0ba3aa 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LocalPreviewHelperTest extends \TYPO3\Components\TestingFramework\Core\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 fbd5896e99af..083e135d2420 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AudioTagRendererTest extends \TYPO3\Components\TestingFramework\Core\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 d594ff135842..e7390b094e60 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RendererRegistryTest extends \TYPO3\Components\TestingFramework\Core\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 58e41cd722d3..cd86ea60c565 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class VideoTagRendererTest extends \TYPO3\Components\TestingFramework\Core\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 d97fa0a25739..f0f50f7fe0ef 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class VimeoRendererTest extends \TYPO3\Components\TestingFramework\Core\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 b2e701f90467..bb849070e607 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class YouTubeRendererTest extends \TYPO3\Components\TestingFramework\Core\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 15e5e838f899..f4b64fbe7a8d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var AbstractRepository
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
index 9e41641ca54f..8da57a5345ef 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Resource\ResourceCompressor;
 class ResourceCompressorTest extends BaseTestCase
 {
     /**
-     * @var ResourceCompressor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var ResourceCompressor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
index c00017f286dd..4c90558b1cde 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ResourceFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
@@ -93,7 +93,7 @@ class ResourceFactoryTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
      */
     public function retrieveFileOrFolderObjectCallsGetFolderObjectFromCombinedIdentifierWithRelativePath()
     {
-        /** @var $subject \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Core\Resource\ResourceFactory */
+        /** @var $subject \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Core\Resource\ResourceFactory */
         $subject = $this->getAccessibleMock(
             \TYPO3\CMS\Core\Resource\ResourceFactory::class,
             ['getFolderObjectFromCombinedIdentifier'],
@@ -113,7 +113,7 @@ class ResourceFactoryTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
      */
     public function retrieveFileOrFolderObjectCallsGetFolderObjectFromCombinedIdentifierWithAbsolutePath()
     {
-        /** @var $subject \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Core\Resource\ResourceFactory */
+        /** @var $subject \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Core\Resource\ResourceFactory */
         $subject = $this->getAccessibleMock(
             \TYPO3\CMS\Core\Resource\ResourceFactory::class,
             ['getFolderObjectFromCombinedIdentifier'],
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
index 5efcbbb7380b..53a5b4d7e6e9 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
@@ -620,7 +620,7 @@ class ResourceStorageTest extends BaseTestCase
         /** @var $mockedDriver \TYPO3\CMS\Core\Resource\Driver\AbstractDriver|\PHPUnit_Framework_MockObject_MockObject */
         $mockedDriver = $this->getMockForAbstractClass(AbstractDriver::class);
         $mockedDriver->expects($this->once())->method('isFolderEmpty')->will($this->returnValue(false));
-        /** @var $subject ResourceStorage|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject ResourceStorage|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(ResourceStorage::class, ['checkFolderActionPermission'], [], '', false);
         $subject->expects($this->any())->method('checkFolderActionPermission')->will($this->returnValue(true));
         $subject->_set('driver', $mockedDriver);
diff --git a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php
index 3e832b0fcf60..71cf0ccb6c81 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PlainTextExtractorTest extends \TYPO3\Components\TestingFramework\Core\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 6de660963800..1b510e81e4b3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TextExtractorRegistryTest extends \TYPO3\Components\TestingFramework\Core\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 78374f3b7145..0b1d227b9090 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileExtensionFilterTest extends \TYPO3\Components\TestingFramework\Core\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 0c70c097ef1f..c5dafd204006 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DependencyOrderingServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -165,7 +165,7 @@ class DependencyOrderingServiceTest extends \TYPO3\CMS\Components\TestingFramewo
      */
     public function prepareDependenciesBuildsFullIdentifierList(array $dependencies, array $expectedDependencies)
     {
-        /** @var DependencyOrderingService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
+        /** @var DependencyOrderingService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
         $dependencyOrderingService = $this->getAccessibleMock(DependencyOrderingService::class, ['dummy']);
         $preparedDependencies = $dependencyOrderingService->_call('prepareDependencies', $dependencies);
         $this->assertEquals($expectedDependencies, $preparedDependencies);
@@ -729,7 +729,7 @@ class DependencyOrderingServiceTest extends \TYPO3\CMS\Components\TestingFramewo
      */
     public function findPathInGraphReturnsCorrectPath(array $graph, $from, $to, array $expected)
     {
-        /** @var DependencyOrderingService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
+        /** @var DependencyOrderingService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
         $dependencyOrderingService = $this->getAccessibleMock(DependencyOrderingService::class, ['dummy']);
         $path = $dependencyOrderingService->_call('findPathInGraph', $graph, $from, $to);
 
diff --git a/typo3/sysext/core/Tests/Unit/Service/MarkerBasedTemplateServiceTest.php b/typo3/sysext/core/Tests/Unit/Service/MarkerBasedTemplateServiceTest.php
index 4f523c33825a..b91c9beefba0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MarkerBasedTemplateServiceTest extends \TYPO3\Components\TestingFramework\Core\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 c22a3678abc0..23058f8bf98b 100644
--- a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
@@ -29,10 +29,10 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider
  */
-class DatabaseTreeDataProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatabaseTreeDataProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|DatabaseTreeDataProvider|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|DatabaseTreeDataProvider|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
@@ -42,7 +42,7 @@ class DatabaseTreeDataProviderTest extends \TYPO3\CMS\Components\TestingFramewor
     protected $treeData;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|DatabaseConnection|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|DatabaseConnection|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $database;
 
diff --git a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
index 151b14a75b61..b94496118125 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TreeDataProviderFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var TreeDataProviderFactory
diff --git a/typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php b/typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php
index 29030fffaa96..5e7f3b2f4d2a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EnumerationTest extends \TYPO3\Components\TestingFramework\Core\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 1c3df08b1e46..485a75ab447d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileInfoTest extends \TYPO3\Components\TestingFramework\Core\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 6806fa92efc2..7788265de276 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ImageInfoTest extends \TYPO3\Components\TestingFramework\Core\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 2000e175a250..6e5d47da9319 100644
--- a/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Core\Tests\Unit\TypoScript\Parser;
 /**
  * Test case for \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
  */
-class TypoScriptParserTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class TypoScriptParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $typoScriptParser = null;
 
diff --git a/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php b/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
index 8b72537f3096..db7b1ddd36a4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TemplateServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\TypoScript\TemplateService
@@ -32,7 +32,7 @@ class TemplateServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
     protected $templateService;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Core\TypoScript\TemplateService
+     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Core\TypoScript\TemplateService
      */
     protected $templateServiceMock;
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
index 967925ac617f..178dd0fb3269 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ArrayUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 d056565968bd..5dd6ffd76fcc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ClassNamingUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 5879610bf949..af0bdebc66ea 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ClientUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     //////////////////////////////////////////////////////////
     // Utility Functions
diff --git a/typo3/sysext/core/Tests/Unit/Utility/CommandUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/CommandUtilityTest.php
index 689ecd32f10b..7580fceeeddc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CommandUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 2051c73d248f..633f7766b1ce 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CsvUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/core/Tests/Unit/Utility/DebugUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/DebugUtilityTest.php
index 05028aec1a1a..4460056c2737 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DebugUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 1ce2bb4303e6..e96cbd36c038 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionManagementUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 4c203e3fd236..b480ef5ca530 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtendedFileUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 9ccafcae2e0d..7e2b531b24bd 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
 use org\bovigo\vfs\vfsStreamWrapper;
-use TYPO3\CMS\Components\TestingFramework\Core\FileStreamWrapper;
+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;
@@ -34,7 +34,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\GeneralUtility
  */
-class GeneralUtilityTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class GeneralUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 9c53edb452f2..57a3b2027746 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class HttpUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 3b1e55ba5a97..e68bdb7bbb5f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MailUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 1241483a693f..92619c90e145 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MathUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 3aaeb37b0350..8c5395a45e4b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PathUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 4be67b109592..8c5f98db75b0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ResourceUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
index e5023c42fdbc..a2a3ac4bfa4a 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
@@ -19,10 +19,10 @@ use TYPO3\CMS\Core\Utility\RootlineUtility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\RootlineUtility
  */
-class RootlineUtilityTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class RootlineUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var RootlineUtility|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RootlineUtility|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $subject;
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
index 8c05966dfe52..0a84d35d82ad 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class StringUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 4fc65b803686..898acfd67a94 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class VersionNumberUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Data Provider for convertVersionNumberToIntegerConvertsVersionNumbersToIntegers
diff --git a/typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php b/typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php
index eb879b8923e8..0e9d6d5945bb 100644
--- a/typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php
+++ b/typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\ViewHelpers;
 
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
diff --git a/typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php b/typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php
index ee0cef599727..d25c2c6a073a 100644
--- a/typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php
+++ b/typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\ViewHelpers;
  */
 
 use Prophecy\Argument;
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Type\Icon\IconState;
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 e87f35e9575c..958a9fa6ed78 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 71d3c34e0345..2608e21c59a1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DocumentFormatTest extends \TYPO3\Components\TestingFramework\Core\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 77e27c72ecb2..94c52d2e72f6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DocumentTest extends \TYPO3\Components\TestingFramework\Core\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 52c2ccc2e62c..c26ce3ab46bc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DocumentTranslationTest extends \TYPO3\Components\TestingFramework\Core\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 9735d44c103d..285bc91a4d3d 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class BackendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\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 888ac868d99f..b59df89bda54 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class AddTest extends \TYPO3\Components\TestingFramework\Core\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 3567fcf3f404..a30a9476ab8f 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class CountTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var int number of all records
@@ -60,7 +60,7 @@ class CountTest extends \TYPO3\CMS\Components\TestingFramework\Core\FunctionalTe
     {
         parent::setUp();
 
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/blogs.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/posts.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/post-post-mm.xml');
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php
index 7a1ac318cefa..056bb34adcb6 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php
@@ -40,7 +40,7 @@ class EnableFieldsTest extends AbstractDataHandlerActionTestCase
     {
         parent::setUp();
 
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/fe_groups.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/fe_users.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/blogs-with-fe_groups.xml');
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.ts b/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.ts
index 24d2b96cac1e..38c577acd0f7 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.ts
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.ts
@@ -28,11 +28,11 @@ page {
 			pluginName = Blogs
 			vendorName = ExtbaseTeam
 		}
-		stdWrap.postUserFunc = TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
+		stdWrap.postUserFunc = TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
 		stdWrap.postUserFunc.as = Extbase
 	}
 
-	stdWrap.postUserFunc = TYPO3\CMS\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
+	stdWrap.postUserFunc = TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
 }
 
 [globalVar = GP:L = 1]
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 413131a1ede5..e7f9eea62421 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class DataMapperTest extends \TYPO3\Components\TestingFramework\Core\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 46c7dbe073f9..cb90895230b2 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class InTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var \ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository
@@ -50,7 +50,7 @@ class InTest extends \TYPO3\CMS\Components\TestingFramework\Core\FunctionalTestC
     {
         parent::setUp();
 
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/blogs.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/posts.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/tags.xml');
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
index c0637e25e592..11578dc12c7d 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class OperatorTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var \ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository
@@ -51,7 +51,7 @@ class OperatorTest extends \TYPO3\CMS\Components\TestingFramework\Core\Functiona
     {
         parent::setUp();
 
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/blogs.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/posts.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/tags.xml');
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
index 03904ee3c63e..ec0e797b77c4 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class QueryParserTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
index 8dcab02e3bf5..1081595aa724 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class RelationTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var \ExtbaseTeam\BlogExample\Domain\Model\Blog
@@ -47,7 +47,7 @@ class RelationTest extends \TYPO3\CMS\Components\TestingFramework\Core\Functiona
     {
         parent::setUp();
 
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/blogs.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/posts.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/tags.xml');
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
index 8b5960b77056..903fb25a5840 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class TranslationTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var array
@@ -57,7 +57,7 @@ class TranslationTest extends \TYPO3\CMS\Components\TestingFramework\Core\Functi
          *   -> EN: Post2
          * Post3
          */
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/blogs.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/translated-posts.xml');
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
index ec1b153ef88f..f6cfa50722f3 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
@@ -17,15 +17,15 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Configuration;
 /**
  * Test case
  */
-class AbstractConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $abstractConfigurationManager;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Service\TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Service\TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $mockTypoScriptService;
 
@@ -351,7 +351,7 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFram
      */
     public function switchableControllerActionsAreNotOverriddenIfPluginNameIsSpecified()
     {
-        /** @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager::class, ['overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions', 'getRecursiveStoragePids']);
         $abstractConfigurationManager->_set('typoScriptService', $this->mockTypoScriptService);
         $abstractConfigurationManager->setConfiguration(['switchableControllerActions' => ['overriddenSwitchableControllerActions']]);
@@ -365,7 +365,7 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFram
      */
     public function switchableControllerActionsAreOverriddenIfSpecifiedPluginIsTheCurrentPlugin()
     {
-        /** @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $configuration = ['extensionName' => 'CurrentExtensionName', 'pluginName' => 'CurrentPluginName', 'switchableControllerActions' => ['overriddenSwitchableControllerActions']];
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager::class, ['overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions', 'getRecursiveStoragePids']);
         $this->mockTypoScriptService->expects($this->any())->method('convertTypoScriptArrayToPlainArray')->with($configuration)->will($this->returnValue($configuration));
@@ -381,7 +381,7 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFram
      */
     public function switchableControllerActionsAreOverriddenIfPluginNameIsNotSpecified()
     {
-        /** @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $configuration = ['switchableControllerActions' => ['overriddenSwitchableControllerActions']];
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager::class, ['overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions', 'getRecursiveStoragePids']);
         $this->mockTypoScriptService->expects($this->any())->method('convertTypoScriptArrayToPlainArray')->with($configuration)->will($this->returnValue($configuration));
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
index 01a90ea0419d..f52ce5da00c4 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
@@ -18,15 +18,15 @@ use Prophecy\Prophecy\ObjectProphecy;
 /**
  * Test case
  */
-class BackendConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $backendConfigurationManager;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Service\TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Service\TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $mockTypoScriptService;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
index c0a7ad98e28a..20c49d571b45 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FrontendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject
@@ -26,12 +26,12 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFram
     protected $mockContentObject;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $frontendConfigurationManager;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Service\TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Service\TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $mockTypoScriptService;
 
@@ -330,7 +330,7 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Components\TestingFram
                 'framework' => 'configuration'
             ]
         ];
-        /** @var \TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $frontendConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager::class, ['overrideStoragePidIfStartingPointIsSet', 'overrideConfigurationFromPlugin', 'overrideConfigurationFromFlexForm']);
         $frontendConfigurationManager->expects($this->at(0))->method('overrideStoragePidIfStartingPointIsSet')->with($frameworkConfiguration)->will($this->returnValue(['overridden' => 'storagePid']));
         $frontendConfigurationManager->expects($this->at(1))->method('overrideConfigurationFromPlugin')->with(['overridden' => 'storagePid'])->will($this->returnValue(['overridden' => 'pluginConfiguration']));
diff --git a/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php b/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php
index f76bc29c9177..ca8bf1fd0b16 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BootstrapTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
@@ -57,14 +57,14 @@ class BootstrapTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTest
             ]
         ];
 
-        /** @var $configurationManagerMock \TYPO3\CMS\Extbase\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $configurationManagerMock \TYPO3\CMS\Extbase\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $configurationManagerMock = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class, ['getConfiguration']);
         $configurationManagerMock->expects($this->any())->method('getConfiguration')->with('Framework')->will($this->returnValue($frameworkSettings));
 
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject  $objectManager */
         $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
 
-        /** @var $bootstrapMock \TYPO3\CMS\Extbase\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $bootstrapMock \TYPO3\CMS\Extbase\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $bootstrapMock = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Core\Bootstrap::class, ['inject']);
         $bootstrapMock->_set('objectManager', $objectManager);
         $bootstrapMock->_set('configurationManager', $configurationManagerMock);
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
index a931ab85f932..e4967addde6f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUserGroupTest extends \TYPO3\Components\TestingFramework\Core\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 26d96284973c..e301fbb21d2d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUserTest extends \TYPO3\Components\TestingFramework\Core\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 34c4f65aa70f..c8c6997cf486 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CategoryTest extends \TYPO3\Components\TestingFramework\Core\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 62cc1f71324b..261944b2f30e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileMountTest extends \TYPO3\Components\TestingFramework\Core\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 720a9d4705c0..d0ab3c53a71c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FrontendUserGroupTest extends \TYPO3\Components\TestingFramework\Core\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 4016aa25aa56..cbd1911aef88 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FrontendUserTest extends \TYPO3\Components\TestingFramework\Core\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 e10435cd6eb1..a8cf5b2fcb5d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUserGroupRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 684055de7a38..e0454a2623a9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendUserRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 b718e6f5f6df..aaf2cb553771 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CategoryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 e7ec1fa58398..f74f0877c2dd 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileMountRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/DomainObject/AbstractEntityTest.php b/typo3/sysext/extbase/Tests/Unit/DomainObject/AbstractEntityTest.php
index 0866f8c9fcdb..091617909608 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractEntityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Error/ErrorTest.php b/typo3/sysext/extbase/Tests/Unit/Error/ErrorTest.php
index be1bf0555805..e49507e4185d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ErrorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Error/MessageTest.php b/typo3/sysext/extbase/Tests/Unit/Error/MessageTest.php
index 2cdbf37efec3..52de9901a874 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MessageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php b/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
index 876b1ec27b4b..5657e01638f0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ResultTest extends \TYPO3\Components\TestingFramework\Core\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 86739f85b8a8..1edff2d676b5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CheckFlexFormValueTest extends \TYPO3\Components\TestingFramework\Core\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 630a122c344c..a14b5af93ad3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CommandManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
@@ -50,7 +50,7 @@ class CommandManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
      */
     public function getAvailableCommandsReturnsAllAvailableCommands()
     {
-        /** @var \TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $commandManager */
+        /** @var \TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $commandManager */
         $commandManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class, ['dummy']);
         $commandManager->_set('objectManager', $this->mockObjectManager);
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'] = [
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
index e81a3ac70e05..b90a90451a4b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
@@ -24,10 +24,10 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli;
 /**
  * Test case
  */
-class CommandTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class CommandTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Cli\Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Cli\Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $command;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
index ea55518a0e05..fa2240356812 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
@@ -25,15 +25,15 @@ use TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentMixingException;
 /**
  * Test case
  */
-class RequestBuilderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class RequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Cli\RequestBuilder|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_Comparator_MockObject
+     * @var \TYPO3\CMS\Extbase\Mvc\Cli\RequestBuilder|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_Comparator_MockObject
      */
     protected $requestBuilder;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Cli\Request|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Cli\Request|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $request;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
index 42462a82125a..c8b5bd2c39fe 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
@@ -24,10 +24,10 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli;
 /**
  * Test case
  */
-class RequestTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class RequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Cli\Request|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Cli\Request|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $request;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
index a5e8a6c96ed3..c5f8514288fc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractControllerTest extends \TYPO3\Components\TestingFramework\Core\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 080710ae3010..356c111f62a2 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
@@ -22,10 +22,10 @@ use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchActionException;
 /**
  * Test case
  */
-class ActionControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class ActionControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $actionController;
 
@@ -62,7 +62,7 @@ class ActionControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\U
         $mockObjectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class)->will($this->returnValue($mockUriBuilder));
         $mockResponse = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
         $configurationService = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class);
-        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, [
             'initializeFooAction',
             'initializeAction',
@@ -164,7 +164,7 @@ class ActionControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\U
     {
         $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
         $mockRequest->expects($this->once())->method('getControllerActionName')->will($this->returnValue('fooBar'));
-        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, ['fooBarAction'], [], '', false);
         $mockController->_set('request', $mockRequest);
         $this->assertEquals('fooBarAction', $mockController->_call('resolveActionMethodName'));
@@ -179,7 +179,7 @@ class ActionControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\U
         $this->expectExceptionCode(1186669086);
         $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
         $mockRequest->expects($this->once())->method('getControllerActionName')->will($this->returnValue('fooBar'));
-        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, ['otherBarAction'], [], '', false);
         $mockController->_set('request', $mockRequest);
         $mockController->_call('resolveActionMethodName');
@@ -316,7 +316,7 @@ class ActionControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\U
      */
     public function setViewConfigurationResolvesTemplateRootPathsForTemplateRootPath($configuration, $expected)
     {
-        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $mockController */
+        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, ['dummy'], [], '', false);
         /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
         $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
@@ -394,7 +394,7 @@ class ActionControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\U
      */
     public function setViewConfigurationResolvesLayoutRootPathsForLayoutRootPath($configuration, $expected)
     {
-        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $mockController */
+        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, ['dummy'], [], '', false);
         /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
         $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
@@ -472,7 +472,7 @@ class ActionControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\U
      */
     public function setViewConfigurationResolvesPartialRootPathsForPartialRootPath($configuration, $expected)
     {
-        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $mockController */
+        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, ['dummy'], [], '', false);
         /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
         $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
index 7348d7eede47..b151686c120b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ArgumentTest extends \TYPO3\Components\TestingFramework\Core\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 9e6715b07cfe..d81cdc7cf4c5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ArgumentsTest extends \TYPO3\Components\TestingFramework\Core\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 7da75844d679..b1310e0c2f7e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php
@@ -18,10 +18,10 @@ use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
 /**
  * Test case
  */
-class CommandControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class CommandControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Controller\CommandController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Controller\CommandController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $commandController;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
index 135087ba2252..155a5041de4b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MvcPropertyMappingConfigurationServiceTest extends \TYPO3\Components\TestingFramework\Core\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 a74566825a37..b62f199140b3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
index c53f5252a6c1..b4f9b9bfa48e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc;
 /**
  * Test case
  */
-class ResponseTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class ResponseTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Response|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Response|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $mockResponse;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
index 8a90ecca04d3..90d05026631a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class JsonViewTest extends \TYPO3\Components\TestingFramework\Core\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 9b6335b073a3..5ee13ccfa6b3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CacheHashEnforcerTest extends \TYPO3\Components\TestingFramework\Core\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 b6ab0b49919c..4848cbfdbb97 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
@@ -21,10 +21,10 @@ use TYPO3\CMS\Extbase\Mvc\Exception\InvalidControllerNameException;
 /**
  * Test case
  */
-class RequestBuilderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class RequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $requestBuilder;
 
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 b350d40d9e3a..7a8e51d6a553 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class UriBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var ConfigurationManagerInterface
@@ -55,7 +55,7 @@ class UriBuilderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTes
     protected $mockExtensionService;
 
     /**
-     * @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $uriBuilder;
 
@@ -473,7 +473,7 @@ class UriBuilderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTes
      */
     public function buildFrontendUriCreatesTypoLink()
     {
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
+        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
         $uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
         $uriBuilder->_set('contentObject', $this->mockContentObject);
         $uriBuilder->expects($this->once())->method('buildTypolinkConfiguration')->will($this->returnValue(['someTypoLinkConfiguration']));
@@ -508,7 +508,7 @@ class UriBuilderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTes
      */
     public function buildFrontendUriCreatesAbsoluteUrisIfSpecified()
     {
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
+        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
         $uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
         $uriBuilder->_set('contentObject', $this->mockContentObject);
         $uriBuilder->expects($this->once())->method('buildTypolinkConfiguration')->will($this->returnValue(['foo' => 'bar']));
@@ -524,7 +524,7 @@ class UriBuilderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTes
      */
     public function buildFrontendUriSetsAbsoluteUriSchemeIfSpecified()
     {
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
+        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
         $uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
         $uriBuilder->_set('contentObject', $this->mockContentObject);
         $uriBuilder->expects($this->once())->method('buildTypolinkConfiguration')->will($this->returnValue(['foo' => 'bar']));
@@ -541,7 +541,7 @@ class UriBuilderTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTes
      */
     public function buildFrontendUriDoesNotSetAbsoluteUriSchemeIfCreateAbsoluteUriIsFalse()
     {
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
+        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
         $uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
         $uriBuilder->_set('contentObject', $this->mockContentObject);
         $uriBuilder->expects($this->once())->method('buildTypolinkConfiguration')->will($this->returnValue(['foo' => 'bar']));
diff --git a/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
index cb4ee7b0ee07..706774539866 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ClassInfoFactoryTest extends \TYPO3\Components\TestingFramework\Core\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 6d117392b8f9..35adc9066b0f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ContainerTest extends \TYPO3\Components\TestingFramework\Core\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 1e7b84232249..0c7178376d42 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
@@ -17,14 +17,14 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
 /**
  * Test case
  */
-class BackendTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class BackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
      */
     public function insertRelationInRelationtableSetsMmMatchFieldsInRow()
     {
-        /* \TYPO3\CMS\Extbase\Persistence\Generic\Backend|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /* \TYPO3\CMS\Extbase\Persistence\Generic\Backend|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $fixture = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class, ['dummy'], [], '', false);
         /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper|\PHPUnit_Framework_MockObject_MockObject */
         $dataMapper = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
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 450f228ba7cd..323d9eb249b4 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface;
+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;
@@ -23,7 +23,7 @@ use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap;
 /**
  * Test case
  */
-class DataMapFactoryTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class DataMapFactoryTest extends \TYPO3\Components\TestingFramework\Core\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 7a90c0f0c35a..51565445e31e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface;
+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;
@@ -23,7 +23,7 @@ use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper;
 /**
  * Test case
  */
-class DataMapperTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class DataMapperTest extends \TYPO3\Components\TestingFramework\Core\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 c154c0be71ac..ce91ea257f23 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PersistenceManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
@@ -76,7 +76,7 @@ class PersistenceManagerTest extends \TYPO3\CMS\Components\TestingFramework\Core
         $mockBackend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
         $mockBackend->expects($this->once())->method('getIdentifierByObject')->with($object)->will($this->returnValue($fakeUuid));
 
-        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $manager */
+        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $manager */
         $manager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, ['dummy']);
         $manager->_set('backend', $mockBackend);
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
index 193229aebdcb..ff7263358a76 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class QueryFactoryTest extends \TYPO3\Components\TestingFramework\Core\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 9345947bb3b4..5bfd2a8ec031 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class QueryResultTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult
@@ -185,7 +185,7 @@ class QueryResultTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTe
      */
     public function initializeExecutesQueryWithArrayFetchMode()
     {
-        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $queryResult = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryResult::class, ['dummy'], [$this->mockQuery]);
         $queryResult->_set('persistenceManager', $this->mockPersistenceManager);
         $queryResult->_set('dataMapper', $this->mockDataMapper);
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
index 7d5edb0a9992..d9a8c359268b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class QueryTest extends \TYPO3\Components\TestingFramework\Core\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 aa54d4d1fbb7..e503cb1b2816 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SessionTest extends \TYPO3\Components\TestingFramework\Core\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 69c6d7ada706..7986a9f4ac7b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class Typo3DbBackendTest extends \TYPO3\Components\TestingFramework\Core\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 4bd5928adff5..2e89311eb344 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class Typo3DbQueryParserTest extends \TYPO3\Components\TestingFramework\Core\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 aceab17868aa..5fff68bcd6b4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class Typo3QuerySettingsTest extends \TYPO3\Components\TestingFramework\Core\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 989c52778518..5510a7d1402c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ObjectStorageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
index 709c0ad54d9c..b76d782d7c4c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
@@ -19,10 +19,10 @@ use TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnsupportedMethodException;
 /**
  * Test case
  */
-class RepositoryTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class RepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\Repository|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Persistence\Repository|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $repository;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
index 98f4308874bc..041c1fca7f96 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PropertyMapperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     protected $mockConfigurationBuilder;
 
@@ -70,7 +70,7 @@ class PropertyMapperTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
      */
     public function sourceTypeCanBeCorrectlyDetermined($source, $sourceType)
     {
-        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $propertyMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class, ['dummy']);
         $this->assertEquals($sourceType, $propertyMapper->_call('determineSourceType', $source));
     }
@@ -96,7 +96,7 @@ class PropertyMapperTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
     {
         $this->expectException(InvalidSourceException::class);
         $this->expectExceptionCode(1297773150);
-        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $propertyMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class, ['dummy']);
         $propertyMapper->_call('determineSourceType', $source);
     }
@@ -126,7 +126,7 @@ class PropertyMapperTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
     {
         $mockTypeConverter = $this->getMockTypeConverter();
         $this->mockConfiguration->expects($this->any())->method('getTypeConverter')->will($this->returnValue($mockTypeConverter));
-        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $propertyMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class, ['dummy']);
         $this->assertSame($mockTypeConverter, $propertyMapper->_call('findTypeConverter', 'someSource', 'someTargetType', $this->mockConfiguration));
     }
@@ -361,7 +361,7 @@ class PropertyMapperTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
      */
     public function findFirstEligibleTypeConverterInObjectHierarchyShouldReturnNullIfSourceTypeIsUnknown()
     {
-        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $propertyMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class, ['dummy']);
         $this->assertNull($propertyMapper->_call('findFirstEligibleTypeConverterInObjectHierarchy', 'source', 'unknownSourceType', \TYPO3\CMS\Extbase\Core\Bootstrap::class));
     }
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationBuilderTest.php
index dc2a30d3086d..6aaa9baa2f84 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PropertyMappingConfigurationBuilderTest extends \TYPO3\Components\TestingFramework\Core\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 fd8168152078..50f8d8e2737d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PropertyMappingConfigurationTest extends \TYPO3\Components\TestingFramework\Core\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 7f44de54688b..5206f71aceb4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ArrayConverterTest extends \TYPO3\Components\TestingFramework\Core\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 358a0cdfa836..65c422e960af 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BooleanConverterTest extends \TYPO3\Components\TestingFramework\Core\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 e1d4c788567e..d60bf4eceb78 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DateTimeConverterTest extends \TYPO3\Components\TestingFramework\Core\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 8b322bdee139..5e232e8467bf 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FloatConverterTest extends \TYPO3\Components\TestingFramework\Core\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 4d431079ea8d..15e79254b2c1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IntegerConverterTest extends \TYPO3\Components\TestingFramework\Core\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 21f7f425c03e..99d943ff38ec 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ObjectConverterTest extends \TYPO3\Components\TestingFramework\Core\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 c0f5f07025c7..ebac81b25bc3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PersistentObjectConverterTest extends \TYPO3\Components\TestingFramework\Core\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 f0b2fff87116..9a92c8d440e8 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class StringConverterTest extends \TYPO3\Components\TestingFramework\Core\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 7c95dee4ee79..63828abd4c72 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ClassSchemaTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/DocCommentParserTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/DocCommentParserTest.php
index 340410972d3d..2adac4f368ea 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DocCommentParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php
index 6a38eee7ccb3..25bf961acd03 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ObjectAccessTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     protected $dummyObject;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php
index e01fee7f7fe1..d5f7e49a61d6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ReflectionServiceTest extends \TYPO3\Components\TestingFramework\Core\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 65a877ee246b..0b5b6bc51231 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FieldProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -33,7 +33,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
     public function getCommandControllerActionFieldFetchesCorrectClassNames()
     {
 
-        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $command1 */
+        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $command1 */
         $command1 = $this->getAccessibleMock(Command::class, [], [], '', false);
         $command1->expects($this->once())->method('isInternal')->will($this->returnValue(false));
         $command1->expects($this->once())->method('isCliOnly')->will($this->returnValue(false));
@@ -41,7 +41,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
         $command1->expects($this->once())->method('getControllerCommandName')->will($this->returnValue('FuncA'));
         $command1->expects($this->once())->method('getCommandIdentifier')->will($this->returnValue('extbase:mocka:funca'));
 
-        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $command2 */
+        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $command2 */
         $command2 = $this->getAccessibleMock(Command::class, [], [], '', false);
         $command2->expects($this->once())->method('isInternal')->will($this->returnValue(false));
         $command2->expects($this->once())->method('isCliOnly')->will($this->returnValue(false));
@@ -49,7 +49,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
         $command2->expects($this->once())->method('getControllerCommandName')->will($this->returnValue('FuncB'));
         $command2->expects($this->once())->method('getCommandIdentifier')->will($this->returnValue('mypkg:mockb:funcb'));
 
-        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $command3 */
+        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $command3 */
         $command3 = $this->getAccessibleMock(Command::class, [], [], '', false);
         $command3->expects($this->once())->method('isInternal')->will($this->returnValue(false));
         $command3->expects($this->once())->method('isCliOnly')->will($this->returnValue(false));
@@ -63,7 +63,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
             ->getMock();
         $commandManager->expects($this->any())->method('getAvailableCommands')->will($this->returnValue([$command1, $command2, $command3]));
 
-        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
+        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
         $fieldProvider = $this->getAccessibleMock(
             FieldProvider::class,
             ['getActionLabel'],
@@ -84,7 +84,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
      */
     public function getCommandControllerActionFieldSkipsInternalCommands()
     {
-        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $command1 */
+        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $command1 */
         $command = $this->getAccessibleMock(Command::class, [], [], '', false);
         $command->method('isInternal')->will($this->returnValue(true));
         $command->method('isCliOnly')->will($this->returnValue(false));
@@ -98,7 +98,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
             ->getMock();
         $commandManager->expects($this->any())->method('getAvailableCommands')->will($this->returnValue([$command]));
 
-        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
+        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
         $fieldProvider = $this->getAccessibleMock(
             FieldProvider::class,
             ['getActionLabel'],
@@ -117,7 +117,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
      */
     public function getCommandControllerActionFieldSkipsCliOnlyCommands()
     {
-        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $command1 */
+        /** @var Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $command1 */
         $command = $this->getAccessibleMock(Command::class, [], [], '', false);
         $command->method('isInternal')->will($this->returnValue(false));
         $command->method('isCliOnly')->will($this->returnValue(true));
@@ -131,7 +131,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
             ->getMock();
         $commandManager->expects($this->any())->method('getAvailableCommands')->will($this->returnValue([$command]));
 
-        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
+        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
         $fieldProvider = $this->getAccessibleMock(
             FieldProvider::class,
             ['getActionLabel'],
@@ -161,7 +161,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
      */
     public function validateAdditionalFieldsReturnsTrue()
     {
-        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
+        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
         $fieldProvider = $this->getAccessibleMock(
             FieldProvider::class,
             ['dummy'],
@@ -210,7 +210,7 @@ class FieldProviderTest extends \TYPO3\CMS\Components\TestingFramework\Core\Unit
             ->getMock();
         $commandManager->expects($this->any())->method('getAvailableCommands')->will($this->returnValue([$command1, $command2, $command3]));
 
-        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
+        /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $fieldProvider */
         $fieldProvider = $this->getAccessibleMock(
             FieldProvider::class,
             ['getActionLabel', 'getArgumentLabel', 'getCommandControllerActionArgumentFields'],
diff --git a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
index 1ee125f7c370..3d851752cb90 100644
--- a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Scheduler;
 /**
  * Test case
  */
-class TaskTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class TaskTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Scheduler\Task|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Scheduler\Task|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $task;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Security/Cryptography/HashServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Security/Cryptography/HashServiceTest.php
index 19a4847ab495..5b31f956415e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class HashServiceTest extends \TYPO3\Components\TestingFramework\Core\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 d19bfe8ed2ab..c934cf3d240e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CacheServiceTest extends \TYPO3\Components\TestingFramework\Core\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 016dba920a88..d6b072f94165 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionServiceTest extends \TYPO3\Components\TestingFramework\Core\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 6b9f0d7987e6..1d525b61ecd7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FlexFormServiceTest extends \TYPO3\Components\TestingFramework\Core\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 beaf089c3690..b40ef967066f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ImageScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var ImageService
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/TypoScriptServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/TypoScriptServiceTest.php
index 71abfd7ea9e2..d6d0266e2a04 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TypoScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\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 490fbc64c87f..bcf43fd118af 100644
--- a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
@@ -22,10 +22,10 @@ use TYPO3\CMS\Extbase\Tests\Unit\SignalSlot\Fixtures\SlotMethodDoesNotExistFixtu
 /**
  * Test case
  */
-class DispatcherTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class DispatcherTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $signalSlotDispatcher;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/ArrayUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/ArrayUtilityTest.php
index 43632d16b920..ff5a4a87ea0b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ArrayUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
index 2349f9135ba5..4d473eb48ec5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DebuggerUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
index b935ed63b140..3b3bab4f3b1e 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 a25dcf0d8f88..473528d30eb6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LocalizationUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 2089fc95556a..1a02ea599533 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractCompositeValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 3b0612a85632..29a33e0685a8 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 eeca3b583d35..54fd8a9db1af 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\CMS\Components\TestingFramework\Core\UnitTestCase
+abstract class AbstractValidatorTestcase extends \TYPO3\Components\TestingFramework\Core\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 a0b191f23177..8568f51cef10 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AlphanumericValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 49ff9de099a0..bf2a22dae8ca 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CollectionValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var string
@@ -44,7 +44,7 @@ class CollectionValidatorTest extends \TYPO3\CMS\Components\TestingFramework\Cor
     /**
      * @param array $options
      * @param array $mockedMethods
-     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected function getValidator(array $options = [], array $mockedMethods = ['translateErrorMessage'])
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
index c16247e7be45..4aa0f0f3dae4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConjunctionValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -105,7 +105,7 @@ class ConjunctionValidatorTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function removingAValidatorOfTheValidatorConjunctionWorks()
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $validatorConjunction = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class, ['dummy'], [[]], '', true);
         $validator1 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
             ->setMethods(['validate', 'getOptions'])
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
index df57cd1f211f..813d970ebe82 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DisjunctionValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 415f8914247d..64466945b7c9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EmailAddressValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 2d38a5077e9d..e9b1c75ffcce 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class NumberRangeValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 11459a8a79b0..5000e9b6a854 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class NumberValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 d0b55418e51e..d7f48611ac85 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RegularExpressionValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 776636a2c26f..f7ca65541f64 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class StringLengthValidatorTest extends \TYPO3\Components\TestingFramework\Core\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 6f060e4cb320..93982889cf03 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
@@ -20,10 +20,10 @@ use TYPO3\CMS\Extbase\Validation\Exception\NoSuchValidatorException;
 /**
  * Test case
  */
-class ValidatorResolverTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class ValidatorResolverTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver | \PHPUnit_Framework_MockObject_MockObject | \TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver | \PHPUnit_Framework_MockObject_MockObject | \TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $validatorResolver;
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
index 9527008866f9..b2ac37600f6b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DownloadControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
index 5eb82e42e751..cb7ba85b0fc3 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\CMS\Components\TestingFramework\Core\AccessibleObjectInterface;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Extensionmanager\Controller\UpdateFromTerController;
 
 /**
  * Update from TER controller test
  *
  */
-class UpdateFromTerControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class UpdateFromTerControllerTest extends \TYPO3\Components\TestingFramework\Core\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 2880901c2eb1..2bf4ff3e4302 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class UploadExtensionFileControllerTest extends \TYPO3\Components\TestingFramework\Core\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 f29c567dfd6c..039746814c9d 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
@@ -19,10 +19,10 @@ use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
  * Download queue test
  *
  */
-class DownloadQueueTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class DownloadQueueTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Extensionmanager\Domain\Model\DownloadQueue
+     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Extensionmanager\Domain\Model\DownloadQueue
      */
     protected $downloadQueueMock;
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
index 1024607ce75e..f6b45222742b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionTest extends \TYPO3\Components\TestingFramework\Core\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 2edb9971a074..687b4714298a 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
@@ -18,10 +18,10 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Repository;
  * Tests for ConfigurationItemRepository
  *
  */
-class ConfigurationItemRepositoryTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConfigurationItemRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extensionmanager\Domain\Repository\ConfigurationItemRepository|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extensionmanager\Domain\Repository\ConfigurationItemRepository|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $configurationItemRepository;
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
index a961282bd20b..dfda131f499f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RepositoryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 302edbfe7e2f..0782dbe41bfc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionStatusTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
@@ -154,7 +154,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('findOneTypo3OrgRepository')
             ->will($this->returnValue(null));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -187,7 +187,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('findOneTypo3OrgRepository')
             ->will($this->returnValue($mockRepository));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -221,7 +221,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('findOneTypo3OrgRepository')
             ->will($this->returnValue($mockRepository));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -266,7 +266,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->will($this->returnValue($mockExtensionList));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -312,7 +312,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->will($this->returnValue($mockExtensionList));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -357,7 +357,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->will($this->returnValue($mockExtensionList));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -402,7 +402,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->will($this->returnValue($mockExtensionList));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -448,7 +448,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->will($this->returnValue($mockExtensionList));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -494,7 +494,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->will($this->returnValue($mockExtensionList));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -539,7 +539,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->will($this->returnValue($mockExtensionList));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
@@ -584,7 +584,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->will($this->returnValue($mockExtensionList));
 
-        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
index c317db23d10d..ccab3da50b87 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionManagementServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
index 012a07fb9698..61e835f51305 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class UpdateExtensionListTaskTest extends \TYPO3\Components\TestingFramework\Core\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 62cfc034f778..247735034324 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
@@ -18,14 +18,14 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
  * Configuration utility test
  *
  */
-class ConfigurationUtilityTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConfigurationUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
      */
     public function getCurrentConfigurationReturnsExtensionConfigurationAsValuedConfiguration()
     {
-        /** @var $configurationUtility \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $configurationUtility \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $configurationUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class)
             ->setMethods(['getDefaultConfigurationFromExtConfTemplateAsValuedArray'])
             ->getMock();
@@ -61,7 +61,7 @@ class ConfigurationUtilityTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function getDefaultConfigurationFromExtConfTemplateAsValuedArrayReturnsExpectedExampleArray()
     {
-        /** @var $configurationUtility \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $configurationUtility \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $configurationUtility = $this->getAccessibleMock(
             \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class,
             ['getDefaultConfigurationRawString']
@@ -245,7 +245,7 @@ class ConfigurationUtilityTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function convertValuedToNestedConfiguration(array $configuration, array $expected)
     {
-        /** @var $subject \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class, ['dummy'], [], '', false);
         $this->assertEquals($expected, $subject->convertValuedToNestedConfiguration($configuration));
     }
@@ -313,7 +313,7 @@ class ConfigurationUtilityTest extends \TYPO3\CMS\Components\TestingFramework\Co
      */
     public function convertNestedToValuedConfiguration(array $configuration, array $expected)
     {
-        /** @var $subject \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class, ['dummy'], [], '', false);
         $this->assertEquals($expected, $subject->convertNestedToValuedConfiguration($configuration));
     }
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
index 3503f2229bd5..fefa10743818 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DependencyUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 cb9dc3c5a2d8..c9dd5ab223b3 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EmConfUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
index 8535d4839f0d..50c85b7ff76a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionModelUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
index d5248cee3345..86e6278d2e6b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FileHandlingUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 81b72aea67fc..69e561d02d66 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InstallUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var string
@@ -35,7 +35,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
     protected $fakedExtensions = [];
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Utility\InstallUtility|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Utility\InstallUtility|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $installMock;
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
index eda854adc661..1c9f91d96bf1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ListUtilityTest extends \TYPO3\Components\TestingFramework\Core\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 932db1fd879c..880efdbb7321 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 82ca9ef9855e..e21287159a9b 100644
--- a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
+++ b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
@@ -27,10 +27,10 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 /**
  * Test case
  */
-class FrontendLoginControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class FrontendLoginControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Felogin\Controller\FrontendLoginController|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Felogin\Controller\FrontendLoginController|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $accessibleFixture;
 
diff --git a/typo3/sysext/filemetadata/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php b/typo3/sysext/filemetadata/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
index 83503646c485..bcd3a99add52 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FileMetadataVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['filemetadata'];
 
diff --git a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
index 41b7df413e88..662fecb217d3 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class EscapeChildrenRenderingStandaloneTest extends \TYPO3\Components\TestingFramework\Core\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 400df44fdbc3..f85d1a54dfe4 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class EscapeChildrenRenderingTest extends \TYPO3\Components\TestingFramework\Core\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 5028a2bedd33..ec199afefe5a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FluidTemplateCacheTest extends \TYPO3\Components\TestingFramework\Core\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 93d39a6e2594..bd46b44e3910 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class XmlnsNamespaceTemplatePreProcessorTest extends \TYPO3\Components\TestingFramework\Core\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 658e24f161bf..326c6e3210a1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LegacyNamespaceExpressionNodeTest extends \TYPO3\Components\TestingFramework\Core\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 afb6326d8dc9..788c0d3359d5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RenderingContextTest extends \TYPO3\Components\TestingFramework\Core\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 3d6eafb808cc..48fc2cbdb413 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CmsVariableProviderTest extends \TYPO3\Components\TestingFramework\Core\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 31a8658eb77c..2ce7fc675573 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractViewHelperTest extends \TYPO3\Components\TestingFramework\Core\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 8ed0994b00ce..6e6643d5f57d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ArgumentDefinitionTest extends \TYPO3\Components\TestingFramework\Core\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 a1810062c3e5..31214ecfb588 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ViewHelperResolverTest extends \TYPO3\Components\TestingFramework\Core\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 38f6a1b34d2b..0a2b2b195947 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractWidgetControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -57,7 +57,7 @@ class AbstractWidgetControllerTest extends \TYPO3\CMS\Components\TestingFramewor
         $request->expects($this->once())->method('getWidgetContext')->will($this->returnValue($widgetContext));
         /** @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject $response */
         $response = $this->createMock(\TYPO3\CMS\Extbase\Mvc\ResponseInterface::class);
-        /** @var AbstractWidgetController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $abstractWidgetController */
+        /** @var AbstractWidgetController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $abstractWidgetController */
         $abstractWidgetController = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class, ['resolveActionMethodName', 'initializeActionMethodArguments', 'initializeActionMethodValidators', 'initializeAction', 'checkRequestHash', 'mapRequestArgumentsToControllerArguments', 'buildControllerContext', 'resolveView', 'callActionMethod'], [], '', false);
         $mockUriBuilder = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
         $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
index dbdcafab0ff4..93eda163388d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractWidgetViewHelperTest extends \TYPO3\Components\TestingFramework\Core\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 0eb361ce9449..f31a5261f794 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AjaxWidgetContextHolderTest extends \TYPO3\Components\TestingFramework\Core\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 367df9a26133..f1f6c113b722 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class WidgetContextTest extends \TYPO3\Components\TestingFramework\Core\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 63e1159f4990..99b35efd9ba7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class WidgetRequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\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 4ed6acc3c572..97a4d846d8d4 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class WidgetRequestHandlerTest extends \TYPO3\Components\TestingFramework\Core\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 59c2f2e65e8e..290475bd9aa6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class WidgetRequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php b/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
index f48ed05751c0..12dc33bd1c0a 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
@@ -13,7 +13,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\View;
  *
  * The TYPO3 project - inspiring people to share!
  */
-use TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Fluid\View\AbstractTemplateView;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
@@ -21,7 +21,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 /**
  * Test case
  */
-class AbstractTemplateViewTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractTemplateViewTest extends \TYPO3\Components\TestingFramework\Core\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 b5c6a1cbf77e..db0e7f50bcaa 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class StandaloneViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
@@ -39,7 +39,7 @@ class StandaloneViewTest extends \TYPO3\CMS\Components\TestingFramework\Core\Uni
     protected $singletonInstances = [];
 
     /**
-     * @var StandaloneView|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StandaloneView|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $view;
 
diff --git a/typo3/sysext/fluid/Tests/Unit/View/TemplatePathsTest.php b/typo3/sysext/fluid/Tests/Unit/View/TemplatePathsTest.php
index cca2f9385d12..50b0a9f9219d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TemplatePathsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/BaseViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/BaseViewHelperTest.php
index f051e264cf1f..7a1a1dd00547 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/BaseViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/BaseViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\BaseViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php
index dac5f68432ce..bd9a4e1c135e 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Be\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 
 /**
  * Testcase for be.security.ifAuthenticated view helper
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php
index 602e1a5c0480..94ba68343ff1 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Be\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 
 /**
  * Testcase for be.security.ifHasRole view helper
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php
index 9a012e0a53a3..47181b1ad975 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
  */
 
 use Prophecy\Argument;
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Fluid\ViewHelpers\CObjectViewHelper;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
index bf16977907b1..96cfce3b843b 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Fluid\ViewHelpers\FlashMessagesViewHelper;
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php
index aeec21f24f90..b869b825a912 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 
 /**
  * Test for the Abstract Form view helper
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php
index 9966284f4ef3..f45830216926 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Form\ButtonViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php
index 1cf7bb86f371..3c57e99c6c68 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php
@@ -2,7 +2,7 @@
 namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
 
 use Prophecy\Argument;
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 use TYPO3\CMS\Fluid\ViewHelpers\Form\CheckboxViewHelper;
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
index fb5c3c569b53..9229f3297efb 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php
index 32ef9e8c9312..6bfb197223b9 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 use TYPO3\CMS\Fluid\ViewHelpers\Form\RadioViewHelper;
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
index 43b9c68d641d..ccf133a9a4a2 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php
index fa078f69dc2f..cbadb4e5f5ee 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Extbase\Reflection\ReflectionService;
 use TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\EmptySyntaxTreeNode;
 use TYPO3\CMS\Fluid\ViewHelpers\Form\TextfieldViewHelper;
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
index d10efdf1fe00..7c92e6235b11 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
index 5c39f72faea6..c47d924b8ad0 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface;
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php
index 5180ec20c880..7bb142f2ef3c 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\BytesViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
index b29e2b66f005..de693406e2e0 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\CaseViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
index 5b634065446d..54229b9c7cf9 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\CropViewHelper;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php
index 320078392abc..bcdb738bbda5 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\CurrencyViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
index 7eb3333ecd06..7ddbb2879809 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\DateViewHelper;
 
@@ -24,7 +24,7 @@ use TYPO3\CMS\Fluid\ViewHelpers\Format\DateViewHelper;
 class DateViewHelperTest extends ViewHelperBaseTestcase
 {
     /**
-     * @var DateViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var DateViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
index 4accd49fddbf..8e71585f572f 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  */
 
 use Prophecy\Prophecy\ObjectProphecy;
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Extbase\Reflection\ReflectionService;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\HtmlentitiesDecodeViewHelper;
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
index 94c8913cc243..d3f94a1e6e93 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\HtmlentitiesViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
index a063a910d4bc..809572bc7352 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\Nl2brViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
index 7633121a0d36..6c28d745932b 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\NumberViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
index 3384ba232f91..8201d4ac9b7b 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\PaddingViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
index 76e2343efa4b..e91d6d62b651 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\StripTagsViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
index aaa90c25638e..8d30011db24d 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\UrlencodeViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
index 5c837f5bd906..b080fb73e00d 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase;
+use TYPO3\Components\TestingFramework\Core\UnitTestCase;
 use TYPO3\CMS\Core\Resource\FileReference;
 use TYPO3\CMS\Extbase\Service\ImageService;
 use TYPO3\CMS\Fluid\ViewHelpers\ImageViewHelper;
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
index 46b5354d3aac..fb3abcd65812 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Link\EmailViewHelper;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
index 7a92b9faf0d7..e6ce6dd71b24 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
index 116ccffd5caa..1b252c48c142 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Link\PageViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
index c656d69dbf79..1b78c3eefb33 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Fluid\ViewHelpers\Link\TypolinkViewHelper;
@@ -26,7 +26,7 @@ use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 class TypolinkViewHelperTest extends ViewHelperBaseTestcase
 {
     /**
-     * @var TypolinkViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var TypolinkViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
index 3eb70bd0d64c..45f66630ab7a 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 
 /**
  * Testcase for security.ifAuthenticated view helper
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php
index b5c7ff7aee11..bcd0b90bb924 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 
 /**
  * Testcase for security.ifHasRole view helper
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
index d04db4f9ef80..2d496edbed26 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Fixtures\TranslateViewHelperFixtureForEmptyString;
 use TYPO3\CMS\Fluid\ViewHelpers\TranslateViewHelper;
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
index da84715a8cb4..598084ade164 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Uri;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Uri\EmailViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php
index 26eeb54c2cfe..a63f634af114 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Uri;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Uri\ExternalViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/PageViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/PageViewHelperTest.php
index caa80834265e..1c3add812937 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/PageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/PageViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Uri;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Uri\PageViewHelper;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
index 6333d570d523..b639701577b8 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Uri;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 use TYPO3\CMS\Fluid\ViewHelpers\Uri\TypolinkViewHelper;
 
 /**
@@ -81,7 +81,7 @@ class TypolinkViewHelperTest extends ViewHelperBaseTestcase
      */
     public function createTypolinkParameterFromArgumentsReturnsExpectedArray($input, $additionalParametersFromFluid, $expected)
     {
-        /** @var \TYPO3\CMS\Fluid\ViewHelpers\Uri\TypolinkViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Fluid\ViewHelpers\Uri\TypolinkViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(TypolinkViewHelper::class, ['dummy']);
         $result = $subject->_call('createTypolinkParameterFromArguments', $input, $additionalParametersFromFluid);
         $this->assertSame($expected, $result);
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 c2d967c586b7..54c38668970f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PaginateControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\Query
@@ -26,7 +26,7 @@ class PaginateControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core
     protected $query;
 
     /**
-     * @var \TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $controller;
 
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 9f66b5aff0ee..517e8afa22f5 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 89c1ccb625af..927c96cc7b35 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractBackendControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Controller/FormEditorControllerTest.php b/typo3/sysext/form/Tests/Unit/Controller/FormEditorControllerTest.php
index 0c7112d00bfd..b16c7b1399b8 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormEditorControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Controller/FormFrontendControllerTest.php b/typo3/sysext/form/Tests/Unit/Controller/FormFrontendControllerTest.php
index ffcc54ddf591..b85c45beeb4b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php b/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php
index 2a31c01556fe..18c34ca75581 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormManagerControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Domain/Configuration/ConfigurationServiceTest.php b/typo3/sysext/form/Tests/Unit/Domain/Configuration/ConfigurationServiceTest.php
index 50d12c2ed53f..4e827819fbb6 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConfigurationServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Domain/Finishers/AbstractFinisherTest.php b/typo3/sysext/form/Tests/Unit/Domain/Finishers/AbstractFinisherTest.php
index 2d041f1ea8ce..b3f22289a717 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractFinisherTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php b/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php
index 753836d1e347..59e963c00979 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractSectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Domain/Runtime/FormRuntimeTest.php b/typo3/sysext/form/Tests/Unit/Domain/Runtime/FormRuntimeTest.php
index be17ef6de98f..d92d25ce5c06 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormRuntimeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Hooks/DataStructureIdentifierHookTest.php b/typo3/sysext/form/Tests/Unit/Hooks/DataStructureIdentifierHookTest.php
index 69b58f07e5f5..89fa9326496d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DataStructureIdentifierHookTest extends \TYPO3\Components\TestingFramework\Core\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 f1ebc703be02..7a656933a86f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class InheritancesResolverServiceTest extends \TYPO3\Components\TestingFramework\Core\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 93300a20bc87..64ff6ceb9c0f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TypoScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\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 0586c842c6c8..370342f576ed 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class YamlSourceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
index 18a419a821de..99e49716d526 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FormPersistenceManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php b/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php
index a8d9f3acaa41..b8c686a51b9b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ProcessingRuleTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Validation/CountValidatorTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Validation/CountValidatorTest.php
index 86f599e2ce6c..667433036bd9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CountValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Validation/EmptyValidatorTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Validation/EmptyValidatorTest.php
index 29e2186b0ccd..271195021c2a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EmptyValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Validation/MimeTypeValidatorTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Validation/MimeTypeValidatorTest.php
index 2288cd27c1f1..2f5c9e7c3d6f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MimeTypeValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Service/TranslationServiceTest.php b/typo3/sysext/form/Tests/Unit/Service/TranslationServiceTest.php
index 7cccbee3c481..8920c46bfed5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TranslationServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php b/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php
index 3cba04f465aa..243449518cd0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DatePickerViewHelperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php
index 2af95e13d3a3..6ff43dc1c85f 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class ContentObjectRendererTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var ContentObjectRenderer
diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
index bc84864a36a6..5bc6ca5d88b6 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FluidTemplateContentObjectTest extends \TYPO3\Components\TestingFramework\Core\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 26a5cc5daac5..ed13ad44b4ab 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class TypoScriptFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var TypoScriptFrontendController
diff --git a/typo3/sysext/frontend/Tests/Functional/Page/PageRepositoryTest.php b/typo3/sysext/frontend/Tests/Functional/Page/PageRepositoryTest.php
index 5d87487e3a20..e4662c14c7fc 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class PageRepositoryTest extends \TYPO3\Components\TestingFramework\Core\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 112a47d34466..3d9874d51a66 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class BackendLayoutVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 d51cd026ee07..6ca6235ba032 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 1c3ac101724a..5d47dcdde0fd 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class DomainVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 493700ca8ce4..6492c032ee57 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FrontendGroupsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 89454656b738..93de9e49a73a 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class FrontendUsersVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 ad14686c1d4a..399845d461ad 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class PagesLanguageOverlayVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 e1c9bbf88e93..fea34d667fde 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class TemplateVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 3d82b9d429cf..255aa492877b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\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 e0f79439eb2f..810d89ffc14f 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CaseContentObjectTest extends \TYPO3\Components\TestingFramework\Core\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 5bc26cac3935..1f6218b12e79 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ContentDataProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var ContentDataProcessor
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
index b953f4015dfb..24dab9a36f72 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ContentObjectRendererTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
@@ -63,12 +63,12 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Components\TestingFramework\C
     protected $singletonInstances = [];
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
+     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
      */
     protected $subject = null;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|TypoScriptFrontendController|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|TypoScriptFrontendController|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $frontendControllerMock = null;
 
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
index dd40127b7ae0..1a311be6b0c5 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FilesContentObjectTest extends \TYPO3\Components\TestingFramework\Core\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 9b58cb7bf0d9..233a77905955 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class FluidTemplateContentObjectTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
@@ -32,7 +32,7 @@ class FluidTemplateContentObjectTest extends \TYPO3\CMS\Components\TestingFramew
     protected $singletonInstances = [];
 
     /**
-     * @var FluidTemplateContentObject|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var FluidTemplateContentObject|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject = null;
 
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
index 1f037b6f526d..affc054dbb91 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractMenuContentObjectTest extends \TYPO3\Components\TestingFramework\Core\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 b55bd069c60d..1360e55fe987 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class MenuContentObjectFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
index ba27949877ae..cbb82dbedd1e 100644
--- a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
@@ -21,10 +21,10 @@ use TYPO3\CMS\Frontend\Page\PageRepository;
 /**
  * Testcase for TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
  */
-class TypoScriptFrontendControllerTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class TypoScriptFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|TypoScriptFrontendController
+     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|TypoScriptFrontendController
      */
     protected $subject;
 
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
index b779646d35e6..b80a97313daf 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CacheHashCalculatorTest extends \TYPO3\Components\TestingFramework\Core\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 a6046a2c0929..a062d14a9354 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PageGeneratorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var PageGeneratorFixture
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php b/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
index 6449b186bc5d..c9394164c98d 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Page;
 /**
  * Test case
  */
-class PageRepositoryTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class PageRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Frontend\Page\PageRepository|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Frontend\Page\PageRepository|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $pageSelectObject;
 
diff --git a/typo3/sysext/frontend/Tests/Unit/Plugin/AbstractPluginTest.php b/typo3/sysext/frontend/Tests/Unit/Plugin/AbstractPluginTest.php
index 945e94162101..fc26615d81df 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractPluginTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var AbstractPlugin
diff --git a/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php b/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
index 51c4624854fe..c7b6a74e1bb9 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class GalleryProcessorTest extends \TYPO3\Components\TestingFramework\Core\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 c2061de3004f..edb1a01e3f49 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class TypoLinkCodecServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var TypoLinkCodecService
diff --git a/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php b/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
index 2c04404ad8db..49185f34e863 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AdminPanelViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Set up
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php b/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php
index b9b83125e45e..5c9c8e560e59 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+abstract class AbstractExportTestCase extends \TYPO3\Components\TestingFramework\Core\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 603051a4dbf4..b2bc314ac2de 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class IndexConfigVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 1e1222c9880e..a806bd539c4b 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class LikeWildcardTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
index b36d60547eb0..324f6b065eaa 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class IndexerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Indexer instance
diff --git a/typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php b/typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php
index 2ba089e226a0..6ffe4726855b 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class SqlSchemaMigrationServiceTest extends \TYPO3\Components\TestingFramework\Core\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 6994bc2ec343..25008c56c69d 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionCompatibilityTesterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Package\UnitTestPackageManager A backup of unit test package manager
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
index b0b7398d6a8f..e00a24505f04 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
@@ -26,7 +26,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getNameReturnsSetName()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $name = $this->getUniqueId('name_');
         $node->_set('name', $name);
@@ -38,7 +38,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getTargetPermissionReturnsSetTargetPermission()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $permission = '1234';
         $node->_set('targetPermission', $permission);
@@ -50,7 +50,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getChildrenReturnsSetChildren()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $children = ['1234'];
         $node->_set('children', $children);
@@ -62,7 +62,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getParentReturnsSetParent()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $node->_set('parent', $parent);
@@ -74,7 +74,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getAbsolutePathCallsParentForPathAndAppendsOwnName()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $parentPath = '/foo/bar';
@@ -90,7 +90,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function isWritableCallsParentIsWritable()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $parentMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $parentMock->expects($this->once())->method('isWritable');
@@ -103,7 +103,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function isWritableReturnsWritableStatusOfParent()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $parentMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $parentMock->expects($this->once())->method('isWritable')->will($this->returnValue(true));
@@ -116,7 +116,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function existsReturnsTrueIfNodeExists()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
@@ -129,7 +129,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function existsReturnsTrueIfIsLinkAndTargetIsDead()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
         $target = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('notExists_');
@@ -146,7 +146,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function existsReturnsFalseIfNodeNotExists()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestFilePath('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
@@ -158,7 +158,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function fixPermissionThrowsExceptionIfPermissionAreAlreadyCorrect()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
             ['isPermissionCorrect', 'getAbsolutePath'],
@@ -181,7 +181,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
         if (function_exists('posix_getegid') && posix_getegid() === 0) {
             $this->markTestSkipped('Test skipped if run on linux as root');
         }
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
             ['isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'],
@@ -209,7 +209,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
         if (function_exists('posix_getegid') && posix_getegid() === 0) {
             $this->markTestSkipped('Test skipped if run on linux as root');
         }
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
             ['isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'],
@@ -234,7 +234,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function fixPermissionReturnsOkStatusIfPermissionCanBeFixedAndSetsPermissionToCorrectValue()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
             ['isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'],
@@ -260,7 +260,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function isPermissionCorrectReturnsTrueOnWindowsOs()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['isWindowsOs'], [], '', false);
         $node->expects($this->once())->method('isWindowsOs')->will($this->returnValue(true));
         $this->assertTrue($node->_call('isPermissionCorrect'));
@@ -271,7 +271,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function isPermissionCorrectReturnsFalseIfTargetPermissionAndCurrentPermissionAreNotIdentical()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['isWindowsOs', 'getCurrentPermission'], [], '', false);
         $node->expects($this->any())->method('isWindowsOs')->will($this->returnValue(false));
         $node->expects($this->any())->method('getCurrentPermission')->will($this->returnValue('foo'));
@@ -284,7 +284,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getCurrentPermissionReturnsCurrentDirectoryPermission()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('dir_');
         chmod($path, 02775);
@@ -298,7 +298,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getCurrentPermissionReturnsCurrentFilePermission()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $file = $this->getVirtualTestFilePath('file_');
         touch($file);
@@ -315,7 +315,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366398198);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $node->_call('getRelativePathBelowSiteRoot', '/tmp');
     }
@@ -325,7 +325,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getRelativePathCallsGetAbsolutePathIfPathIsNull()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
             ['getAbsolutePath'],
@@ -342,7 +342,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getRelativePathBelowSiteRootReturnsSingleForwardSlashIfGivenPathEqualsPathSiteConstant()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $result = $node->_call('getRelativePathBelowSiteRoot', PATH_site);
         $this->assertSame('/', $result);
@@ -353,7 +353,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
      */
     public function getRelativePathBelowSiteRootReturnsSubPath()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, ['dummy'], [], '', false);
         $result = $node->_call('getRelativePathBelowSiteRoot', PATH_site . 'foo/bar');
         $this->assertSame('/foo/bar', $result);
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/DefaultFactoryTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/DefaultFactoryTest.php
index afe6510fcfcf..b554e0f1350c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DefaultFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
index d5415d8f7aed..fdd129f83775 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
@@ -28,7 +28,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366222203);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $node->__construct([], null);
     }
@@ -41,7 +41,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366226639);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $structure = [
             'name' => 'foo/bar',
@@ -55,7 +55,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     public function constructorCallsCreateChildrenIfChildrenAreSet()
     {
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['createChildren'],
@@ -80,7 +80,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     public function constructorSetsParent()
     {
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $structure = [
             'name' => 'foo',
@@ -95,7 +95,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     public function constructorSetsTargetPermission()
     {
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $targetPermission = '2550';
         $structure = [
@@ -111,7 +111,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function constructorSetsName()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $name = $this->getUniqueId('test_');
@@ -124,7 +124,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getStatusReturnsArray()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -147,7 +147,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getStatusReturnsArrayWithWarningStatusIfDirectoryNotExists()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -173,7 +173,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getStatusReturnsArrayWithErrorStatusIfNodeIsNotADirectory()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -200,7 +200,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getStatusReturnsArrayWithErrorStatusIfDirectoryExistsButIsNotWritable()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -227,7 +227,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getStatusReturnsArrayWithNoticeStatusIfDirectoryExistsButPermissionAreNotCorrect()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -254,7 +254,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getStatusReturnsArrayWithOkStatusIfDirectoryExistsAndPermissionAreCorrect()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -281,7 +281,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getStatusCallsGetStatusOnChildren()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['exists', 'isDirectory', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'isWritable'],
@@ -306,7 +306,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getStatusReturnsArrayWithOwnStatusAndStatusOfChild()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['exists', 'isDirectory', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'isWritable'],
@@ -334,7 +334,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function fixCallsFixSelfAndReturnsItsResult()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['fixSelf'],
@@ -352,7 +352,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function fixCallsFixOnChildrenAndReturnsMergedResult()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['fixSelf'], [], '', false);
         $uniqueReturnSelf = $this->getUniqueId('foo_');
         $node->expects($this->once())->method('fixSelf')->will($this->returnValue([$uniqueReturnSelf]));
@@ -375,7 +375,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function fixSelfCallsCreateDirectoryIfDirectoryDoesNotExistAndReturnsResult()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['exists', 'createDirectory', 'isPermissionCorrect'],
@@ -395,7 +395,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function fixSelfReturnsErrorStatusIfNodeExistsButIsNotADirectoryAndReturnsResult()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['exists', 'isWritable', 'getRelativePathBelowSiteRoot', 'isDirectory', 'getAbsolutePath'],
@@ -417,7 +417,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function fixSelfCallsFixPermissionIfDirectoryExistsButIsNotWritable()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
             ['exists', 'isWritable', 'fixPermission'],
@@ -438,7 +438,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     {
         $this->expectException(Exception::class);
         $this->expectExceptionCode(1366740091);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['exists', 'getAbsolutePath'], [], '', false);
         $node->expects($this->once())->method('getAbsolutePath')->will($this->returnValue(''));
         $node->expects($this->once())->method('exists')->will($this->returnValue(true));
@@ -450,7 +450,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function createDirectoryCreatesDirectory()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestFilePath('dir_');
         $node->expects($this->once())->method('exists')->will($this->returnValue(false));
@@ -465,7 +465,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function createDirectoryReturnsOkStatusIfDirectoryWasCreated()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestFilePath('dir_');
         $node->expects($this->once())->method('exists')->will($this->returnValue(false));
@@ -479,7 +479,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function createDirectoryReturnsErrorStatusIfDirectoryWasNotCreated()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestDir('root_');
         chmod($path, 02550);
@@ -497,7 +497,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366222204);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $brokenStructure = [
             [
@@ -514,7 +514,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366222205);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $brokenStructure = [
             [
@@ -531,7 +531,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366222206);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $brokenStructure = [
             [
@@ -551,7 +551,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function getChildrenReturnsCreatedChild()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $childName = $this->getUniqueId('test_');
@@ -578,7 +578,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function isWritableReturnsFalseIfNodeDoesNotExist()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestFilePath('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
@@ -590,7 +590,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function isWritableReturnsTrueIfNodeExistsAndFileCanBeCreated()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('root_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
@@ -605,7 +605,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
         if (function_exists('posix_getegid') && posix_getegid() === 0) {
             $this->markTestSkipped('Test skipped if run on linux as root');
         }
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('root_');
         chmod($path, 02550);
@@ -618,7 +618,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function isDirectoryReturnsTrueIfNameIsADirectory()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
@@ -631,7 +631,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function isDirectoryReturnsFalseIfNameIsALinkToADirectory()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, ['getAbsolutePath'], [], '', false);
         $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('root_');
         \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
index 649f2be23421..42bac4a17927 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
@@ -28,7 +28,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366927513);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $node->__construct([], null);
     }
@@ -41,7 +41,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366222207);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $structure = [
             'name' => 'foo/bar',
@@ -55,7 +55,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     public function constructorSetsParent()
     {
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $structure = [
             'name' => 'foo',
@@ -70,7 +70,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     public function constructorSetsTargetPermission()
     {
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $targetPermission = '0660';
         $structure = [
@@ -86,7 +86,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function constructorSetsName()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $name = $this->getUniqueId('test_');
@@ -101,7 +101,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1380364361);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $structure = [
@@ -117,7 +117,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function constructorSetsTargetContent()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $targetContent = $this->getUniqueId('content_');
@@ -134,7 +134,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function constructorSetsTargetContentToContentOfTargetContentFile()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $targetFile = $this->getVirtualTestFilePath('test_');
@@ -155,7 +155,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1380364362);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $targetFile = $this->getVirtualTestFilePath('test_');
@@ -171,7 +171,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function targetContentIsNullIfNotGiven()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $structure = [
@@ -186,7 +186,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function getStatusReturnsArray()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -209,7 +209,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithWarningStatusIFileNotExists()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -236,7 +236,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithErrorStatusIfNodeIsNotAFile()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -264,7 +264,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function getStatusReturnsArrayNoticeStatusIfFileExistsButIsNotWritable()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -292,7 +292,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithNoticeStatusIfFileExistsButPermissionAreNotCorrect()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -320,7 +320,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithNoticeStatusIfFileExistsButContentIsNotCorrect()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -348,7 +348,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithOkStatusIfFileExistsAndPermissionAreCorrect()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -376,7 +376,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function fixCallsFixSelfAndReturnsItsResult()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['fixSelf'],
@@ -394,7 +394,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function fixSelfCallsCreateFileIfFileDoesNotExistAndReturnsResult()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'],
@@ -417,7 +417,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function fixSelfCallsSetsContentIfFileCreationWasSuccessfulAndTargetContentIsNotNullAndReturnsResult()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'],
@@ -443,7 +443,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function fixSelfDoesNotCallSetContentIfFileCreationFailed()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'],
@@ -466,7 +466,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function fixSelfDoesNotCallSetContentIfFileTargetContentIsNull()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'],
@@ -489,7 +489,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function fixSelfReturnsErrorStatusIfNodeExistsButIsNotAFileAndReturnsResult()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['exists', 'createFile', 'getAbsolutePath', 'isFile', 'isPermissionCorrect', 'fixPermission'],
@@ -510,7 +510,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function fixSelfCallsFixPermissionIfFileExistsButPermissionAreWrong()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\FileNode::class,
             ['exists', 'createFile', 'getAbsolutePath', 'isFile', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot'],
@@ -550,7 +550,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         $this->expectException(Exception::class);
         $this->expectExceptionCode(1366398198);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['exists', 'getAbsolutePath'], [], '', false);
         $node->expects($this->once())->method('getAbsolutePath')->will($this->returnValue(''));
         $node->expects($this->once())->method('exists')->will($this->returnValue(true));
@@ -562,7 +562,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function createFileReturnsOkStatusIfFileWasCreated()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         $node->expects($this->once())->method('exists')->will($this->returnValue(false));
@@ -576,7 +576,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function createFileCreatesFile()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         $node->expects($this->once())->method('exists')->will($this->returnValue(false));
@@ -591,7 +591,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function createFileReturnsErrorStatusIfFileWasNotCreated()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestDir();
         chmod($path, 02550);
@@ -609,7 +609,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         $this->expectException(Exception::class);
         $this->expectExceptionCode(1367056363);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
@@ -621,7 +621,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function isContentCorrectReturnsTrueIfTargetContentPropertyIsNull()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         touch($path);
@@ -635,7 +635,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function isContentCorrectReturnsTrueIfTargetContentEqualsCurrentContent()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         $content = $this->getUniqueId('content_');
@@ -650,7 +650,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function isContentCorrectReturnsFalseIfTargetContentNotEqualsCurrentContent()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         $content = $this->getUniqueId('content1_');
@@ -667,7 +667,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     public function isPermissionCorrectReturnsTrueIfTargetPermissionAndCurrentPermissionAreIdentical()
     {
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getCurrentPermission', 'isWindowsOs'], [], '', false);
         $node->expects($this->any())->method('isWindowsOs')->will($this->returnValue(false));
         $node->expects($this->any())->method('getCurrentPermission')->will($this->returnValue('0664'));
@@ -687,7 +687,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         $this->expectException(Exception::class);
         $this->expectExceptionCode(1367060201);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('dir_');
         $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
@@ -702,7 +702,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         $this->expectException(Exception::class);
         $this->expectExceptionCode(1367060202);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         touch($path);
@@ -716,7 +716,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function setContentSetsContentToFile()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         touch($path);
@@ -733,7 +733,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function setContentReturnsOkStatusIfContentWasSuccessfullySet()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         touch($path);
@@ -751,7 +751,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
         if (function_exists('posix_getegid') && posix_getegid() === 0) {
             $this->markTestSkipped('Test skipped if run on linux as root');
         }
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $dir = $this->getVirtualTestDir('dir_');
         $file = $dir . '/' . $this->getUniqueId('file_');
@@ -768,7 +768,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function isFileReturnsTrueIfNameIsFile()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
         $path = $this->getVirtualTestFilePath('file_');
         touch($path);
@@ -782,7 +782,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function isFileReturnsFalseIfNameIsALinkFile()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, ['getAbsolutePath'], [], '', false);
         $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('root_');
         \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
index 519446a2eb27..73a4211e8e64 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LinkNodeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -27,7 +27,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1380485700);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['dummy'], [], '', false);
         $node->__construct([], null);
     }
@@ -40,7 +40,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1380546061);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['dummy'], [], '', false);
         $structure = [
             'name' => 'foo/bar',
@@ -54,7 +54,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     public function constructorSetsParent()
     {
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['dummy'], [], '', false);
         $structure = [
             'name' => 'foo',
@@ -68,7 +68,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function constructorSetsName()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $name = $this->getUniqueId('test_');
@@ -81,7 +81,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function constructorSetsTarget()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $target = '../' . $this->getUniqueId('test_');
@@ -94,7 +94,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getStatusReturnsArray()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['isWindowsOs', 'getAbsolutePath', 'exists'],
@@ -112,7 +112,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getStatusReturnsArrayWithInformationStatusIfRunningOnWindows()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['isWindowsOs', 'getAbsolutePath', 'exists'],
@@ -134,7 +134,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getStatusReturnsArrayWithErrorStatusIfLinkNotExists()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['isWindowsOs', 'getAbsolutePath', 'exists'],
@@ -157,7 +157,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getStatusReturnsArrayWithWarningStatusIfNodeIsNotALink()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'getRelativePathBelowSiteRoot'],
@@ -179,7 +179,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getStatusReturnsErrorStatusIfLinkTargetIsNotCorrect()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'isTargetCorrect', 'getCurrentTarget', 'getRelativePathBelowSiteRoot'],
@@ -203,7 +203,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getStatusReturnsOkStatusIfLinkExistsAndTargetIsCorrect()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'isTargetCorrect', 'getRelativePathBelowSiteRoot'],
@@ -226,7 +226,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function fixReturnsEmptyArray()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['getRelativePathBelowSiteRoot'],
@@ -245,7 +245,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1380556246);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['exists'], [], '', false);
         $node->expects($this->once())->method('exists')->will($this->returnValue(false));
         $this->assertFalse($node->_call('isLink'));
@@ -256,7 +256,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function isLinkReturnsTrueIfNameIsLink()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['exists', 'getAbsolutePath'], [], '', false);
         $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
         $target = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('linkTarget_');
@@ -274,7 +274,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function isFileReturnsFalseIfNameIsAFile()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['exists', 'getAbsolutePath'], [], '', false);
         $path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('file_');
         touch($path);
@@ -291,7 +291,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1380556245);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['exists'], [], '', false);
         $node->expects($this->once())->method('exists')->will($this->returnValue(false));
         $this->assertFalse($node->_call('isTargetCorrect'));
@@ -304,7 +304,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1380556247);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['exists', 'isLink', 'getTarget'], [], '', false);
         $node->expects($this->any())->method('exists')->will($this->returnValue(true));
         $node->expects($this->once())->method('isLink')->will($this->returnValue(false));
@@ -316,7 +316,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function isTargetCorrectReturnsTrueIfNoExpectedLinkTargetIsSpecified()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['exists', 'isLink', 'getTarget'], [], '', false);
         $node->expects($this->any())->method('exists')->will($this->returnValue(true));
         $node->expects($this->any())->method('isLink')->will($this->returnValue(true));
@@ -329,7 +329,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function isTargetCorrectAcceptsATargetWithATrailingSlash()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, ['exists', 'isLink', 'getCurrentTarget', 'getTarget'], [], '', false);
         $node->expects($this->any())->method('exists')->will($this->returnValue(true));
         $node->expects($this->any())->method('isLink')->will($this->returnValue(true));
@@ -350,7 +350,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
         symlink($target, $path);
         $this->testFilesToDelete[] = $path;
         $this->testFilesToDelete[] = $target;
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['exists', 'isLink', 'getTarget', 'getAbsolutePath'],
             [],
@@ -376,7 +376,7 @@ class LinkNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
         symlink($target, $path);
         $this->testFilesToDelete[] = $path;
         $this->testFilesToDelete[] = $target;
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class,
             ['exists', 'isLink', 'getTarget', 'getAbsolutePath'],
             [],
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
index a2e7d73efc53..80abdf929f88 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RootNodeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -28,7 +28,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     {
         $this->expectException(RootNodeException::class);
         $this->expectExceptionCode(1366140117);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $falseParent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $node->__construct([], $falseParent);
@@ -41,7 +41,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366141329);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $structure = [
             'type' => 'root',
@@ -56,7 +56,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366141329);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $node
             ->expects($this->any())
@@ -75,7 +75,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366141329);
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $node
             ->expects($this->any())
@@ -92,7 +92,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function constructorSetsParentToNull()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $node
             ->expects($this->any())
@@ -110,7 +110,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getChildrenReturnsChildCreatedByConstructor()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $node
             ->expects($this->any())
@@ -139,7 +139,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function constructorSetsTargetPermission()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $node
             ->expects($this->any())
@@ -159,7 +159,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function constructorSetsName()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $node
             ->expects($this->any())
@@ -175,7 +175,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getStatusReturnsArrayWithOkStatusAndCallsOwnStatusMethods()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\RootNode::class,
             ['getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -202,7 +202,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getStatusCallsGetChildrenStatusForStatus()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\RootNode::class,
             ['getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect', 'getChildrenStatus'],
@@ -233,7 +233,7 @@ class RootNodeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestC
      */
     public function getAbsolutePathReturnsGivenName()
     {
-        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, ['isWindowsOs'], [], '', false);
         $node
             ->expects($this->any())
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
index 9e348c1598b6..02c6200a8e00 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
@@ -17,14 +17,14 @@ namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
 /**
  * Test case
  */
-class StructureFacadeTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class StructureFacadeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
      */
     public function getStatusReturnsStatusOfStructureAndReturnsItsResult()
     {
-        /** @var $facade \TYPO3\CMS\Install\FolderStructure\StructureFacade|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $facade \TYPO3\CMS\Install\FolderStructure\StructureFacade|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $facade = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\StructureFacade::class, ['dummy'], [], '', false);
         $root = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class);
         $root->expects($this->once())->method('getStatus')->will($this->returnValue([]));
@@ -38,7 +38,7 @@ class StructureFacadeTest extends \TYPO3\CMS\Components\TestingFramework\Core\Un
      */
     public function fixCallsFixOfStructureAndReturnsItsResult()
     {
-        /** @var $facade \TYPO3\CMS\Install\FolderStructure\StructureFacade|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $facade \TYPO3\CMS\Install\FolderStructure\StructureFacade|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $facade = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\StructureFacade::class, ['dummy'], [], '', false);
         $root = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class);
         $root->expects($this->once())->method('fix')->will($this->returnValue([]));
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php b/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php
index 1c39d44b5f8a..b6836b9aa7f2 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\CMS\Components\TestingFramework\Core\UnitTestCase
+abstract class FolderStructureTestCase extends \TYPO3\Components\TestingFramework\Core\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 ed8736ae4fcc..e44e0e0fd060 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
@@ -17,14 +17,14 @@ namespace TYPO3\CMS\Install\Service;
 /**
  * Test case
  */
-class CoreUpdateServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class CoreUpdateServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
      */
     public function getMessagesReturnsPreviouslySetMessage()
     {
-        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
         $aMessage = $this->getUniqueId('message_');
         $instance->_set('messages', $aMessage);
@@ -39,7 +39,7 @@ class CoreUpdateServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\
         if (defined('TYPO3_COMPOSER_MODE') && TYPO3_COMPOSER_MODE) {
             $this->markTestSkipped('This test is only available in Non-Composer mode.');
         }
-        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
         putenv('TYPO3_DISABLE_CORE_UPDATER');
         putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER');
@@ -51,7 +51,7 @@ class CoreUpdateServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\
      */
     public function isCoreUpdateEnabledReturnsFalseFor_TYPO3_DISABLE_CORE_UPDATER_EnvironmentVariableSet()
     {
-        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
         putenv('TYPO3_DISABLE_CORE_UPDATER=1');
         putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER');
@@ -63,7 +63,7 @@ class CoreUpdateServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\
      */
     public function isCoreUpdateEnabledReturnsFalseFor_REDIRECT_TYPO3_DISABLE_CORE_UPDATER_EnvironmentVariableSet()
     {
-        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
         putenv('TYPO3_DISABLE_CORE_UPDATER');
         putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER=1');
@@ -78,7 +78,7 @@ class CoreUpdateServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\
         if (!defined('TYPO3_COMPOSER_MODE')) {
             putenv('TYPO3_COMPOSER_MODE=1');
         }
-        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
         $this->assertFalse($instance->isCoreUpdateEnabled());
     }
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
index b9521ccbe00c..5d3ec428937f 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
@@ -20,14 +20,14 @@ use TYPO3\CMS\Install\Service\Exception\CoreVersionServiceException;
 /**
  * Test case
  */
-class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class CoreVersionServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
      */
     public function updateVersionMatrixStoresVersionMatrixInRegistry()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, ['fetchVersionMatrixFromRemote'], [], '', false);
         $registry = $this->createMock(Registry::class);
         $versionArray = [8 => []];
@@ -42,7 +42,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function updateVersionMatrixRemovesOldReleasesFromMatrix()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, ['fetchVersionMatrixFromRemote'], [], '', false);
         $registry = $this->createMock(Registry::class);
         $versionArray = [
@@ -63,7 +63,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function isInstalledVersionAReleasedVersionReturnsTrueForNonDevelopmentVersion()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, ['getInstalledVersion'], [], '', false);
         $instance->expects($this->once())->method('getInstalledVersion')->will($this->returnValue('7.2.0'));
         $this->assertTrue($instance->isInstalledVersionAReleasedVersion());
@@ -74,7 +74,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function isInstalledVersionAReleasedVersionReturnsFalseForDevelopmentVersion()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, ['getInstalledVersion'], [], '', false);
         $instance->expects($this->once())->method('getInstalledVersion')->will($this->returnValue('7.4-dev'));
         $this->assertFalse($instance->isInstalledVersionAReleasedVersion());
@@ -87,7 +87,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
     {
         $this->expectException(CoreVersionServiceException::class);
         $this->expectExceptionCode(1381263173);
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getMajorVersion', 'ensureVersionExistsInMatrix'],
@@ -113,7 +113,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
     public function getTarGzSha1OfVersionReturnsSha1OfSpecifiedVersion()
     {
         $versionMatrixFixtureFile = __DIR__ . '/Fixtures/VersionMatrixFixture.php';
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getMajorVersion', 'ensureVersionExistsInMatrix'],
@@ -133,7 +133,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function isYoungerPatchReleaseAvailableReturnsTrueIfYoungerReleaseIsAvailable()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getInstalledVersion'],
@@ -167,7 +167,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function isYoungerReleaseAvailableReturnsFalseIfNoYoungerReleaseExists()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getInstalledVersion'],
@@ -201,7 +201,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function isYoungerReleaseAvailableReturnsFalseIfOnlyADevelopmentReleaseIsYounger()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getInstalledVersion'],
@@ -235,7 +235,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function isYoungerDevelopmentReleaseAvailableReturnsTrueIfADevelopmentReleaseIsYounger()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getInstalledVersion'],
@@ -269,7 +269,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function isUpdateSecurityRelevantReturnsTrueIfAnUpdateIsSecurityRelevant()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getInstalledVersion'],
@@ -303,7 +303,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function isUpdateSecurityRelevantReturnsFalseIfUpdateIsNotSecurityRelevant()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getInstalledVersion'],
@@ -335,7 +335,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function getInstalledMajorVersionFetchesInstalledVersionNumber()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, ['getInstalledVersion'], [], '', false);
         $instance->expects($this->once())->method('getInstalledVersion')->will($this->returnValue('7.2.0'));
         $this->assertSame('7', $instance->_call('getInstalledMajorVersion'));
@@ -371,7 +371,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function getMajorVersionReturnsCorrectMajorVersion($version, $expectedMajor)
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, ['dummy'], [], '', false);
         $this->assertSame($expectedMajor, $instance->_call('getMajorVersion', $version));
     }
@@ -383,7 +383,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
     {
         $this->expectException(CoreVersionServiceException::class);
         $this->expectExceptionCode(1380898792);
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, ['fetchVersionMatrixFromRemote'], [], '', false);
         $registry = $this->createMock(Registry::class);
         $registry->expects($this->once())->method('get')->will($this->returnValue(null));
@@ -396,7 +396,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
      */
     public function getVersionMatrixReturnsMatrixFromRegistry()
     {
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, ['fetchVersionMatrixFromRemote'], [], '', false);
         $registry = $this->createMock(Registry::class);
         $versionArray = [$this->getUniqueId()];
@@ -419,7 +419,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
                 ],
             ],
         ];
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getMajorVersion', 'ensureVersionExistsInMatrix'],
@@ -438,7 +438,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
     public function getReleaseTimestampOfVersionReturnsTimestamp()
     {
         $versionMatrixFixtureFile = __DIR__ . '/Fixtures/VersionMatrixFixture.php';
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getMajorVersion', 'ensureVersionExistsInMatrix'],
@@ -459,7 +459,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
         $this->expectException(CoreVersionServiceException::class);
         $this->expectExceptionCode(1380905851);
         $versionMatrixFixtureFile = __DIR__ . '/Fixtures/VersionMatrixFixture.php';
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getMajorVersion'],
@@ -480,7 +480,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core
         $this->expectException(CoreVersionServiceException::class);
         $this->expectExceptionCode(1380905852);
         $versionMatrixFixtureFile = __DIR__ . '/Fixtures/VersionMatrixFixture.php';
-        /** @var $instance CoreVersionService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance CoreVersionService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(
             CoreVersionService::class,
             ['getVersionMatrix', 'getMajorVersion'],
diff --git a/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php
index c23b390c9255..da970a421072 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EnableFileServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Data provider
@@ -66,7 +66,7 @@ class EnableFileServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\
     {
         $vfs = vfsStream::setup('root');
         vfsStream::create($structure, $vfs);
-        /** @var $instance \TYPO3\CMS\Install\Service\EnableFileService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance \TYPO3\CMS\Install\Service\EnableFileService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\EnableFileService::class, ['dummy'], [], '', false);
         $instance->_setStatic('sitePath', 'vfs://root/');
         $this->assertEquals([], array_diff($expected, $instance->_call('getFirstInstallFilePaths')));
@@ -128,7 +128,7 @@ class EnableFileServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\
     {
         $vfs = vfsStream::setup('root');
         vfsStream::create($structure, $vfs);
-        /** @var $instance \TYPO3\CMS\Install\Service\EnableFileService|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $instance \TYPO3\CMS\Install\Service\EnableFileService|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\EnableFileService::class, ['dummy'], [], '', false);
         $instance->_setStatic('sitePath', 'vfs://root/');
         $instance->_call('removeFirstInstallFile');
diff --git a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
index 2d04f4391193..38b85eb4b073 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SilentConfigurationUpgradeServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject
@@ -86,7 +86,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function configureBackendLoginSecurity($current, $setting, $isPackageActive, $hasLocalConfig)
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -140,7 +140,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function removeObsoleteLocalConfigurationSettingsIfThereAreOldSettings()
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -178,7 +178,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function doNotRemoveObsoleteLocalConfigurationSettingsIfThereAreNoOldSettings()
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -214,7 +214,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function doNotGenerateEncryptionKeyIfExists()
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -249,7 +249,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function generateEncryptionKeyIfNotExists()
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -390,7 +390,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function transferHttpSettingsIfSet($currentLocalConfiguration, $newSettings, $localConfigurationNeedsUpdate)
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -433,7 +433,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function disableImageMagickDetailSettingsIfImageMagickIsDisabled()
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -479,7 +479,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function doNotDisableImageMagickDetailSettingsIfImageMagickIsEnabled()
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -520,7 +520,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function setImageMagickDetailSettings()
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
@@ -565,7 +565,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Components\Testin
      */
     public function doNotSetImageMagickDetailSettings()
     {
-        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $silentConfigurationUpgradeServiceInstance SilentConfigurationUpgradeService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface */
         $silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
             SilentConfigurationUpgradeService::class,
             ['dummy'],
diff --git a/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php
index e8ed8a462500..bddd0d4d98b9 100644
--- a/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php
@@ -19,16 +19,16 @@ use TYPO3\CMS\Install\Service\SqlSchemaMigrationService;
 /**
  * Test case
  */
-class SqlSchemaMigrationServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\UnitTestCase
+class SqlSchemaMigrationServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Get a SchemaService instance with mocked DBAL enable database connection, DBAL not enabled
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
      */
     protected function getSqlSchemaMigrationService()
     {
-        /** @var \TYPO3\CMS\Dbal\Database\DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $databaseConnection */
+        /** @var \TYPO3\CMS\Dbal\Database\DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $databaseConnection */
         $subject = $this->getAccessibleMock(SqlSchemaMigrationService::class, ['isDbalEnabled'], [], '', false);
         $subject->expects($this->any())->method('isDbalEnabled')->will($this->returnValue(false));
 
diff --git a/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php b/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
index 501e616940ad..10bd89fa838c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class StatusUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php b/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php
index 90b7cb3987b5..e32423cc090a 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class DocumentationFileTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php b/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php
index 75cd5a199ed3..e77c6bc4c453 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class JsonViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php b/typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
index 52cb303edd3f..955c0f523606 100644
--- a/typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
+++ b/typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Install\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3\Components\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 
 /**
  * Test case
diff --git a/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php
index c6fe6c631fcd..1243f70230c0 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ExtensionTest extends \TYPO3\Components\TestingFramework\Core\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 6d36b02f9d71..eea14cdd3626 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class LanguageTest extends \TYPO3\Components\TestingFramework\Core\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 d9e210fafd52..9b6b3b11e759 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ArrayBrowserTest extends \TYPO3\Components\TestingFramework\Core\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 d1cf9c86ec18..2166e233176c 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AbstractDatabaseRecordListTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
@@ -29,7 +29,7 @@ class AbstractDatabaseRecordListTest extends \TYPO3\CMS\Components\TestingFramew
      */
     public function setTableDisplayOrderConvertsStringInput(array $input, array $expected)
     {
-        /** @var AbstractDatabaseRecordList|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var AbstractDatabaseRecordList|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(AbstractDatabaseRecordList::class, ['dummy']);
         $subject->setTableDisplayOrder($input);
         $this->assertSame($expected, $subject->_get('tableDisplayOrder'));
diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
index 7ad526ce3b06..8bda23e585dd 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+abstract class AbstractRecycleTestCase extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php b/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
index 3cba5db8241d..d8bffeb08caf 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CleanerFieldProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var CleanerFieldProvider
diff --git a/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php b/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
index 2640cc6d6d87..026ffbcafa67 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CleanerTaskTest extends \TYPO3\Components\TestingFramework\Core\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 9faa4f968250..8c3a5824f8f2 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class Typo3StatusTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * Set up
diff --git a/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php b/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php
index 607c64a6b322..d7163c71b520 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class SplitStorageTest extends \TYPO3\Components\TestingFramework\Core\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 9d075b7f1039..caf6e7df2214 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CommandLineBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var CommandLineBackend
diff --git a/typo3/sysext/rsaauth/Tests/Unit/Backend/PhpBackendTest.php b/typo3/sysext/rsaauth/Tests/Unit/Backend/PhpBackendTest.php
index 82d01bbc1c2f..025b46356dcc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PhpBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var PhpBackend
diff --git a/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php b/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php
index fe0f2b7c0166..5b822d88e5cb 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class KeypairTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var Keypair
diff --git a/typo3/sysext/rtehtmlarea/Tests/Functional/Tca/AcronymVisibleFieldsTest.php b/typo3/sysext/rtehtmlarea/Tests/Functional/Tca/AcronymVisibleFieldsTest.php
index 7af597f67cfa..686ffa831b18 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class AcronymVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['rtehtmlarea'];
 
diff --git a/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php b/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php
index e35ac436d407..a31aeb716245 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class SaltedPasswordServiceTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php b/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php
index 41c3fae4bfc2..abafa14085f6 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class BulkUpdateTaskTest extends \TYPO3\Components\TestingFramework\Core\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 1f12e54644a6..e2ad828b280c 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class SaltedPasswordsUtilityTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
index 8fd8f598d912..9e752a0b8b81 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class EvaluatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var Evaluator
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
index 75ab024e0ec4..f4d9ff4d23a2 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class BlowfishSaltTest extends \TYPO3\Components\TestingFramework\Core\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 c44901eaf008..8864b504ebaa 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class Md5SaltTest extends \TYPO3\Components\TestingFramework\Core\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 75d5a1aa77bf..88279c85b424 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class Pbkdf2SaltTest extends \TYPO3\Components\TestingFramework\Core\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 a4b6839cefa9..51b70431becc 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class PhpassSaltTest extends \TYPO3\Components\TestingFramework\Core\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 97e1068956ca..8c88840ce7e2 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SaltFactoryTest extends \TYPO3\Components\TestingFramework\Core\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 a3360e0e92f4..7927c86c3ab1 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SaltedPasswordsUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php b/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php
index a2df42ffc28f..eab15796aa3c 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class TaskGroupVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 3b05187fcdc3..58be8fda8eac 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CronCommandTest extends \TYPO3\Components\TestingFramework\Core\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 eb4bdc8bf965..1a17e12eb23b 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class NormalizeCommandTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
index 33342f541546..6297bebc2dda 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class CachingFrameworkGarbageCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php b/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
index 66eb5e9880c9..84e4a77e6c28 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class SetupModuleControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/sv/Tests/Functional/AuthenticationServiceTest.php b/typo3/sysext/sv/Tests/Functional/AuthenticationServiceTest.php
index c1bfbd392db5..6af8fa6e42a1 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class AuthenticationServiceTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     /**
      * @var AuthenticationService
diff --git a/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php b/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php
index a5b3f1c4e555..ed72bb19d0c7 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class AuthenticationServiceTest extends \TYPO3\Components\TestingFramework\Core\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 f03898f69bff..fec68305cc89 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class ServicesListReportTest extends \TYPO3\Components\TestingFramework\Core\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 174737173099..3a123c8e6cf3 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class ActionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 5fc367a04a11..a5733b7ca661 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class NoteVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 ccaa3dcf13be..2a00c8a5953d 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class ActionHandlerTest extends \TYPO3\Components\TestingFramework\Core\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 9d9e55b6fb25..5855f7bc031e 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class WorkspaceServiceTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['version', 'workspaces'];
 
@@ -49,7 +49,7 @@ class WorkspaceServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\F
      */
     public function versionsFromSpecificWorkspaceCanBeFound()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(__DIR__ . '/../Fixtures/pages.xml');
         $service = new \TYPO3\CMS\Workspaces\Service\WorkspaceService();
         $result = $service->selectVersionsInWorkspace(91, 0, -99, 2);
@@ -64,7 +64,7 @@ class WorkspaceServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\F
      */
     public function versionsFromAllWorkspaceCanBeFound()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(__DIR__ . '/../Fixtures/pages.xml');
         $service = new \TYPO3\CMS\Workspaces\Service\WorkspaceService();
         $result = $service->selectVersionsInWorkspace(\TYPO3\CMS\Workspaces\Service\WorkspaceService::SELECT_ALL_WORKSPACES, 0, -99, 2);
@@ -77,7 +77,7 @@ class WorkspaceServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\F
      */
     public function versionsCanBeFoundRecursive()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(__DIR__ . '/../Fixtures/pages.xml');
         $service = new \TYPO3\CMS\Workspaces\Service\WorkspaceService();
         $result = $service->selectVersionsInWorkspace(91, 0, -99, 1, 99);
@@ -90,7 +90,7 @@ class WorkspaceServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\F
      */
     public function versionsCanBeFilteredToSpecificStage()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(__DIR__ . '/../Fixtures/pages.xml');
         $service = new \TYPO3\CMS\Workspaces\Service\WorkspaceService();
         // testing stage 1
@@ -112,7 +112,7 @@ class WorkspaceServiceTest extends \TYPO3\CMS\Components\TestingFramework\Core\F
      */
     public function versionsCanBeFilteredToSpecificLifecycleStep()
     {
-        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/core/Functional/Fixtures/pages.xml');
+        $this->importDataSet(ORIGINAL_ROOT . 'components/testing_framework/Resources/Core/Functional/Fixtures/pages.xml');
         $this->importDataSet(__DIR__ . '/../Fixtures/pages.xml');
         $service = new \TYPO3\CMS\Workspaces\Service\WorkspaceService();
         // testing all "draft" records
diff --git a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
index 95b99da24bf5..92e19aa4fdc0 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class WorkspaceStageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 6dc017176745..02891dfb4370 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\CMS\Components\TestingFramework\Core\FunctionalTestCase
+class WorkspaceVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\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 ed06fafb6524..8ed4b4762160 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\CMS\Components\TestingFramework\Core\UnitTestCase
+class RemoteServerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Workspaces\Controller\Remote\RemoteServer
-- 
GitLab