diff --git a/feature-libs/asm/customer-360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.spec.ts b/feature-libs/asm/customer-360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.spec.ts
index 98d2423933d..e4993183da1 100644
--- a/feature-libs/asm/customer-360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.spec.ts
+++ b/feature-libs/asm/customer-360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.spec.ts
@@ -11,7 +11,6 @@ import { I18nTestingModule, ImageType, Product } from '@spartacus/core';
 import { FocusConfig, ICON_TYPE } from '@spartacus/storefront';
 
 import { By } from '@angular/platform-browser';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { AsmCustomer360ProductItemComponent } from './asm-customer-360-product-item.component';
 
 @Component({
@@ -80,7 +79,6 @@ describe('AsmCustomer360ProductItemComponent', () => {
         MockTranslatePipe,
         MockCxIconComponent,
         MockMediaComponent,
-        MockFeatureDirective,
       ],
     }).compileComponents();
   });
diff --git a/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.spec.ts b/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.spec.ts
index ad3ab098e16..2db999173f6 100644
--- a/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.spec.ts
+++ b/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.spec.ts
@@ -24,7 +24,6 @@ import {
   FocusDirective,
   LaunchDialogService,
 } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, Observable, of, throwError } from 'rxjs';
 import { AsmCustomer360Config } from '../config/asm-customer-360-config';
 import {
@@ -180,7 +179,6 @@ describe('AsmCustomer360Component', () => {
         MockAsmCustomer360SectionComponent,
         ArgsPipe,
         FocusDirective,
-        MockFeatureDirective,
       ],
       providers: [
         CxDatePipe,
diff --git a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts
index a8879e2404f..0112b975547 100644
--- a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts
+++ b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts
@@ -20,7 +20,6 @@ import { CartItemContext, PromotionLocation } from '@spartacus/cart/base/root';
 import { I18nTestingModule } from '@spartacus/core';
 import { OutletModule } from '@spartacus/storefront';
 import { OutletDirective } from 'projects/storefrontlib/cms-structure/outlet/outlet.directive';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
 import { CartItemComponent } from './cart-item.component';
 import { CartItemContextSource } from './model/cart-item-context-source.model';
@@ -132,7 +131,6 @@ describe('CartItemComponent', () => {
         MockOutletDirective,
         MockCartItemValidationWarningComponent,
         MockAtMessageDirective,
-        MockFeatureDirective,
       ],
       providers: [
         {
diff --git a/feature-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.spec.ts b/feature-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.spec.ts
index 480fadc7985..2e9ae328ada 100644
--- a/feature-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.spec.ts
+++ b/feature-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.spec.ts
@@ -5,7 +5,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { OrderEntry } from '@spartacus/cart/base/root';
 import { QuickOrderFacade } from '@spartacus/cart/quick-order/root';
 import { I18nTestingModule } from '@spartacus/core';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { Subject } from 'rxjs';
 import { QuickOrderItemComponent } from './quick-order-item.component';
 
@@ -66,7 +65,6 @@ describe('QuickOrderItemComponent', () => {
         MockUrlPipe,
         MockItemCounterComponent,
         MockMediaComponent,
-        MockFeatureDirective,
       ],
       providers: [
         { provide: QuickOrderFacade, useClass: MockQuickOrderFacade },
diff --git a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts
index bb3ce2a899a..fb1ae76973e 100644
--- a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts
+++ b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts
@@ -18,7 +18,6 @@ import {
   ProductListItemContext,
   ProductListItemContextSource,
 } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { WishListItemComponent } from './wish-list-item.component';
 
 @Component({
@@ -95,7 +94,6 @@ describe('WishListItemComponent', () => {
         MockAddToCartComponent,
         MockUrlPipe,
         MockAtMessageDirective,
-        MockFeatureDirective,
       ],
     })
       .overrideComponent(WishListItemComponent, {
diff --git a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts
index 649c835ef5d..680d894c1c5 100644
--- a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts
+++ b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts
@@ -1,12 +1,11 @@
 import { Component, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import {
-  ReactiveFormsModule,
   UntypedFormControl,
   UntypedFormGroup,
+  ReactiveFormsModule,
 } from '@angular/forms';
 import { I18nTestingModule } from '@spartacus/core';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
 import { OrderAmendService } from '../amend-order.service';
 import { CancelOrReturnItemsComponent } from './amend-order-items.component';
@@ -80,7 +79,6 @@ describe('CancelOrReturnItemsComponent', () => {
         MockMediaComponent,
         MockItemCounterComponent,
         MockFeatureLevelDirective,
-        MockFeatureDirective,
       ],
     }).compileComponents();
   }));
diff --git a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts
index 268b9795749..230f6bb6474 100644
--- a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts
+++ b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts
@@ -9,7 +9,6 @@ import {
 } from '@spartacus/core';
 import { MyAccountV2OrderHistoryService } from '@spartacus/order/core';
 import { OrderHistoryListView } from '@spartacus/order/root';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { EMPTY, Observable, of } from 'rxjs';
 import { MyAccountV2OrdersComponent } from './my-account-v2-orders.component';
 
@@ -103,7 +102,6 @@ describe(' MyAccountV2OrdersComponent', () => {
         MockUrlPipe,
         MockMediaComponent,
         MockSpinnerComponent,
-        MockFeatureDirective,
       ],
       providers: [
         { provide: RoutingService, useClass: MockRoutingService },
diff --git a/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts b/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts
index 17cc218bbc7..5305afb289c 100644
--- a/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts
+++ b/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts
@@ -5,7 +5,6 @@ import { I18nTestingModule, Images, TranslationService } from '@spartacus/core';
 import { MyAccountV2OrderConsignmentsService } from '@spartacus/order/components';
 import { OrderHistoryView } from '@spartacus/order/root';
 import { MediaContainer } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { EMPTY, Observable } from 'rxjs';
 import { MyAccountV2OrderConsolidatedInformationComponent } from './my-account-v2-order-consolidated-information.component';
 import createSpy = jasmine.createSpy;
@@ -74,7 +73,6 @@ describe('MyAccountV2OrderConsolidatedInformationComponent', () => {
         MyAccountV2OrderConsolidatedInformationComponent,
         MockUrlPipe,
         MockMediaComponent,
-        MockFeatureDirective,
       ],
       providers: [
         {
diff --git a/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.spec.ts b/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.spec.ts
index d708e871467..f7731462c4a 100644
--- a/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.spec.ts
+++ b/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.spec.ts
@@ -2,7 +2,6 @@ import { Component, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { I18nTestingModule } from '@spartacus/core';
 import { ReturnRequest } from '@spartacus/order/root';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
 import { Observable, of } from 'rxjs';
 import { ReturnRequestService } from '../return-request.service';
@@ -38,7 +37,6 @@ describe('ReturnRequestItemsComponent', () => {
         ReturnRequestItemsComponent,
         MockMediaComponent,
         MockFeatureLevelDirective,
-        MockFeatureDirective,
       ],
       providers: [
         { provide: ReturnRequestService, useClass: MockCheckoutService },
diff --git a/feature-libs/pickup-in-store/components/container/pickup-items-details/pickup-items-details.component.spec.ts b/feature-libs/pickup-in-store/components/container/pickup-items-details/pickup-items-details.component.spec.ts
index d0c7bf797c1..b2800750047 100644
--- a/feature-libs/pickup-in-store/components/container/pickup-items-details/pickup-items-details.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/container/pickup-items-details/pickup-items-details.component.spec.ts
@@ -8,7 +8,6 @@ import {
   IconModule,
   MediaModule,
 } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject } from 'rxjs';
 import { StoreModule } from '../../presentational/store';
 import { DeliveryPointsService } from '../../services/delivery-points.service';
@@ -27,7 +26,7 @@ describe('Order - PickUpItemsDetailsComponent', () => {
   };
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [PickUpItemsDetailsComponent, MockFeatureDirective],
+      declarations: [PickUpItemsDetailsComponent],
       imports: [
         CommonModule,
         I18nModule,
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
index a1debd20cfc..cc9e48f3f27 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
@@ -17,16 +17,15 @@ import {
   MediaModule,
 } from '@spartacus/storefront';
 import { UrlTestingModule } from 'projects/core/src/routing/configurable-routes/url-translation/testing/url-testing.module';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, EMPTY, Observable, of } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { CommonConfiguratorTestUtilsService } from '../../../../common/testing/common-configurator-test-utils.service';
 import { Configurator } from '../../../core/model/configurator.model';
 import { ConfiguratorPriceComponentOptions } from '../../price/configurator-price.component';
-import { ConfiguratorStorefrontUtilsService } from '../../service/configurator-storefront-utils.service';
 import { ConfiguratorShowMoreComponent } from '../../show-more/configurator-show-more.component';
 import { ConfiguratorAttributeQuantityComponentOptions } from '../quantity/configurator-attribute-quantity.component';
 import { ConfiguratorAttributeProductCardComponent } from './configurator-attribute-product-card.component';
+import { ConfiguratorStorefrontUtilsService } from '../../service/configurator-storefront-utils.service';
 
 const product: Product = {
   name: 'Product Name',
@@ -169,7 +168,6 @@ describe('ConfiguratorAttributeProductCardComponent', () => {
         MockConfiguratorPriceComponent,
         MockFocusDirective,
         MockConfiguratorAttributeQuantityComponent,
-        MockFeatureDirective,
       ],
       providers: [
         {
diff --git a/feature-libs/product-configurator/rulebased/components/overview-bundle-attribute/configurator-overview-bundle-attribute.component.spec.ts b/feature-libs/product-configurator/rulebased/components/overview-bundle-attribute/configurator-overview-bundle-attribute.component.spec.ts
index d4fb15865e1..d3837e89a25 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-bundle-attribute/configurator-overview-bundle-attribute.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-bundle-attribute/configurator-overview-bundle-attribute.component.spec.ts
@@ -9,7 +9,6 @@ import {
   ProductService,
 } from '@spartacus/core';
 import { MediaModule } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
@@ -75,7 +74,6 @@ describe('ConfiguratorOverviewBundleAttributeComponent', () => {
         ConfiguratorOverviewBundleAttributeComponent,
         MockConfiguratorPriceComponent,
         MockNumericPipe,
-        MockFeatureDirective,
       ],
       providers: [
         { provide: ProductService, useClass: MockProductService },
diff --git a/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.spec.ts b/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.spec.ts
index 9ff9e594e84..6b334e3b09b 100644
--- a/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.spec.ts
@@ -18,15 +18,14 @@ import {
   ConfiguratorRouterExtractorService,
 } from '@spartacus/product-configurator/common';
 import { IconLoaderService } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { Observable, of } from 'rxjs';
 import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
 import { ConfiguratorCommonsService } from '../../core/facade/configurator-commons.service';
 import { Configurator } from '../../core/model/configurator.model';
-import { ConfiguratorExpertModeService } from '../../core/services/configurator-expert-mode.service';
-import * as ConfigurationTestData from '../../testing/configurator-test-data';
 import { ConfiguratorTestUtils } from '../../testing/configurator-test-utils';
 import { ConfiguratorProductTitleComponent } from './configurator-product-title.component';
+import { ConfiguratorExpertModeService } from '../../core/services/configurator-expert-mode.service';
+import * as ConfigurationTestData from '../../testing/configurator-test-data';
 
 const mockProductConfiguration = ConfigurationTestData.productConfiguration;
 const PRODUCT_CODE = ConfigurationTestData.PRODUCT_CODE;
@@ -328,7 +327,6 @@ describe('ConfigProductTitleComponent', () => {
         ConfiguratorProductTitleComponent,
         MockCxIconComponent,
         MockMediaComponent,
-        MockFeatureDirective,
       ],
       providers: [
         {
diff --git a/feature-libs/product-multi-dimensional/selector/components/selector/product-multi-dimensional-selector.component.spec.ts b/feature-libs/product-multi-dimensional/selector/components/selector/product-multi-dimensional-selector.component.spec.ts
index e9e520f64d0..dc23db4f5d5 100644
--- a/feature-libs/product-multi-dimensional/selector/components/selector/product-multi-dimensional-selector.component.spec.ts
+++ b/feature-libs/product-multi-dimensional/selector/components/selector/product-multi-dimensional-selector.component.spec.ts
@@ -1,5 +1,11 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { ProductMultiDimensionalSelectorComponent } from './product-multi-dimensional-selector.component';
+import {
+  ProductMultiDimensionalSelectorService,
+  VariantCategoryGroup,
+  VariantCategoryOption,
+} from '@spartacus/product-multi-dimensional/selector/core';
 import {
   I18nTestingModule,
   Product,
@@ -7,15 +13,8 @@ import {
   RoutingService,
   TranslationService,
 } from '@spartacus/core';
-import {
-  ProductMultiDimensionalSelectorService,
-  VariantCategoryGroup,
-  VariantCategoryOption,
-} from '@spartacus/product-multi-dimensional/selector/core';
+import { ActivatedRoute } from '@angular/router';
 import { CurrentProductService } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
-import { of } from 'rxjs';
-import { ProductMultiDimensionalSelectorComponent } from './product-multi-dimensional-selector.component';
 
 describe('ProductMultiDimensionalSelectorComponent', () => {
   let component: ProductMultiDimensionalSelectorComponent;
@@ -50,10 +49,7 @@ describe('ProductMultiDimensionalSelectorComponent', () => {
 
     await TestBed.configureTestingModule({
       imports: [I18nTestingModule],
-      declarations: [
-        ProductMultiDimensionalSelectorComponent,
-        MockFeatureDirective,
-      ],
+      declarations: [ProductMultiDimensionalSelectorComponent],
       providers: [
         { provide: ProductService, useValue: mockProductService },
         { provide: RoutingService, useValue: mockRoutingService },
diff --git a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.spec.ts b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.spec.ts
index 4a87a383d03..36ebd8feeac 100644
--- a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.spec.ts
+++ b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.spec.ts
@@ -3,10 +3,10 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { I18nTestingModule, ImageGroup, Product } from '@spartacus/core';
 import { CurrentProductService } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { EMPTY, Observable, of } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { ProductImageZoomProductImagesComponent } from './product-image-zoom-product-images.component';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 const firstImage = {
   zoom: {
@@ -99,7 +99,7 @@ class MockProductImageZoomTriggerComponent {
   @Output() dialogClose = new EventEmitter<void>();
 }
 
-fdescribe('ProductImageZoomProductImagesComponent', () => {
+describe('ProductImagesComponent', () => {
   let component: ProductImageZoomProductImagesComponent;
   let fixture: ComponentFixture<ProductImageZoomProductImagesComponent>;
   let currentProductService: CurrentProductService;
diff --git a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.spec.ts b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.spec.ts
index 5ea3d716e44..441291d8741 100644
--- a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.spec.ts
+++ b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.spec.ts
@@ -25,7 +25,6 @@ import {
   BreakpointService,
   CurrentProductService,
 } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { EMPTY, Observable, of } from 'rxjs';
 import { ProductImageZoomViewComponent } from './product-image-zoom-view.component';
 
@@ -142,7 +141,6 @@ describe('ProductImageZoomViewComponent', () => {
         MockMediaComponent,
         MockProductThumbnailsComponent,
         MockProductImageZoomThumbnailsComponent,
-        MockFeatureDirective,
       ],
       providers: [
         { provide: CurrentProductService, useClass: MockCurrentProductService },
diff --git a/integration-libs/cds/src/merchandising/cms-components/merchandising-carousel/merchandising-carousel.component.service.spec.ts b/integration-libs/cds/src/merchandising/cms-components/merchandising-carousel/merchandising-carousel.component.service.spec.ts
index 3bdb12cdd96..c70848db25a 100644
--- a/integration-libs/cds/src/merchandising/cms-components/merchandising-carousel/merchandising-carousel.component.service.spec.ts
+++ b/integration-libs/cds/src/merchandising/cms-components/merchandising-carousel/merchandising-carousel.component.service.spec.ts
@@ -10,7 +10,6 @@ import {
   StrategyResponse,
 } from '@spartacus/cds';
 import { Product, ProductService } from '@spartacus/core';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { Observable, of } from 'rxjs';
 import {
   MerchandisingCarouselClickedEvent,
@@ -147,7 +146,6 @@ describe('MerchandisingCarouselComponentService', () => {
           useValue: mockCdsConfig,
         },
       ],
-      declarations: [MockFeatureDirective],
     });
   }
 
diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/visual-picking-product-list.component.spec.ts b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/visual-picking-product-list.component.spec.ts
index ded46023142..63e67f2b958 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/visual-picking-product-list.component.spec.ts
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/visual-picking-product-list.component.spec.ts
@@ -22,7 +22,6 @@ import {
   IconModule,
   MediaModule,
 } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { Observable, of } from 'rxjs';
 import { CompactAddToCartModule } from './compact-add-to-cart/compact-add-to-cart.module';
 import { VisualPickingProductListItem } from './model/visual-picking-product-list-item.model';
@@ -160,7 +159,7 @@ describe('VisualPickingProductListComponent', () => {
         I18nTestingModule,
         CompactAddToCartModule,
       ],
-      declarations: [VisualPickingProductListComponent, MockFeatureDirective],
+      declarations: [VisualPickingProductListComponent],
       providers: [
         Actions,
         {
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.spec.ts b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.spec.ts
index 159bce4ba27..ab547fbb06c 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.spec.ts
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.spec.ts
@@ -1,8 +1,8 @@
 import { Component, Input, Pipe, PipeTransform } from '@angular/core';
 import {
   ComponentFixture,
-  TestBed,
   fakeAsync,
+  TestBed,
   tick,
   waitForAsync,
 } from '@angular/core/testing';
@@ -18,14 +18,13 @@ import {
   RouterState,
   RoutingService,
 } from '@spartacus/core';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import {
   BehaviorSubject,
   EMPTY,
   Observable,
   ReplaySubject,
-  delay,
   of,
+  delay,
 } from 'rxjs';
 import { CmsComponentData } from '../../../cms-structure/page/model/cms-component-data';
 import { SearchBoxComponentService } from './search-box-component.service';
@@ -173,7 +172,6 @@ describe('SearchBoxComponent', () => {
         MockHighlightPipe,
         MockCxIconComponent,
         MockMediaComponent,
-        MockFeatureDirective,
       ],
       providers: [
         {
diff --git a/projects/storefrontlib/cms-components/product/carousel/product-carousel-item/product-carousel-item.component.spec.ts b/projects/storefrontlib/cms-components/product/carousel/product-carousel-item/product-carousel-item.component.spec.ts
index 8bd3a610dfa..e7dcfaefa0a 100644
--- a/projects/storefrontlib/cms-components/product/carousel/product-carousel-item/product-carousel-item.component.spec.ts
+++ b/projects/storefrontlib/cms-components/product/carousel/product-carousel-item/product-carousel-item.component.spec.ts
@@ -8,7 +8,6 @@ import {
   SimpleChange,
 } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import {
   I18nTestingModule,
@@ -21,8 +20,8 @@ import {
   ProductListItemContext,
   ProductListItemContextSource,
 } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { ProductCarouselItemComponent } from './product-carousel-item.component';
+import { By } from '@angular/platform-browser';
 
 @Pipe({
   name: 'cxUrl',
@@ -81,7 +80,6 @@ describe('ProductCarouselItemComponent in product-carousel', () => {
         MockUrlPipe,
         MockOutletDirective,
         MockMediaComponent,
-        MockFeatureDirective,
       ],
       providers: [
         {
diff --git a/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.spec.ts b/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.spec.ts
index b3848048149..995938189de 100644
--- a/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.spec.ts
+++ b/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.spec.ts
@@ -5,17 +5,17 @@ import {
   PipeTransform,
   TemplateRef,
 } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import {
   CmsProductCarouselComponent,
-  FeatureConfigService,
   I18nTestingModule,
+  FeatureConfigService,
   Product,
   ProductScope,
-  ProductSearchByCodeService,
   ProductService,
+  ProductSearchByCodeService,
 } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
 import { CmsComponentData } from '../../../../cms-structure/page/model/cms-component-data';
@@ -159,6 +159,7 @@ describe('ProductCarouselComponent', () => {
   let fixture: ComponentFixture<ProductCarouselComponent>;
   let featureConfigService: MockFeatureConfigService;
   let productSearchByCodeService: MockProductSearchByCodeService;
+
   const testBedDefaults = {
     imports: [RouterTestingModule, I18nTestingModule],
     declarations: [
diff --git a/projects/storefrontlib/cms-components/product/carousel/product-references/product-references.component.spec.ts b/projects/storefrontlib/cms-components/product/carousel/product-references/product-references.component.spec.ts
index cccf0a041f5..fe08e0e1279 100644
--- a/projects/storefrontlib/cms-components/product/carousel/product-references/product-references.component.spec.ts
+++ b/projects/storefrontlib/cms-components/product/carousel/product-references/product-references.component.spec.ts
@@ -14,7 +14,6 @@ import {
   ProductReference,
   ProductReferenceService,
 } from '@spartacus/core';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { Observable, of } from 'rxjs';
 import { CmsComponentData } from '../../../../cms-structure/page/model/cms-component-data';
 import { CurrentProductService } from '../../current-product.service';
@@ -130,7 +129,6 @@ describe('ProductReferencesComponent', () => {
         MockCarouselComponent,
         MockMediaComponent,
         MockUrlPipe,
-        MockFeatureDirective,
       ],
       providers: [
         {
diff --git a/projects/storefrontlib/cms-components/product/product-images/product-images.component.spec.ts b/projects/storefrontlib/cms-components/product/product-images/product-images.component.spec.ts
index efe41cd2bdf..2d5e5c320b4 100644
--- a/projects/storefrontlib/cms-components/product/product-images/product-images.component.spec.ts
+++ b/projects/storefrontlib/cms-components/product/product-images/product-images.component.spec.ts
@@ -2,7 +2,6 @@ import { Component, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Product } from '@spartacus/core';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { EMPTY, Observable, of } from 'rxjs';
 import { CurrentProductService } from '../current-product.service';
 import { ProductImagesComponent } from './product-images.component';
@@ -89,7 +88,6 @@ describe('ProductImagesComponent', () => {
         ProductImagesComponent,
         MockMediaComponent,
         MockCarouselComponent,
-        MockFeatureDirective,
       ],
       providers: [
         {
diff --git a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts
index 375a41bfc80..31198c4f758 100644
--- a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts
+++ b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts
@@ -16,7 +16,6 @@ import {
   RoutingService,
 } from '@spartacus/core';
 import { OutletDirective, OutletModule } from '@spartacus/storefront';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { MockFeatureLevelDirective } from '../../../../shared/test/mock-feature-level-directive';
 import { ProductListItemContextSource } from '../model/product-list-item-context-source.model';
 import { ProductListItemContext } from '../model/product-list-item-context.model';
@@ -107,7 +106,6 @@ describe('ProductGridItemComponent in product-list', () => {
         MockCxIconComponent,
         MockFeatureLevelDirective,
         MockOutletDirective,
-        MockFeatureDirective,
       ],
       providers: [
         {