diff --git a/alfa-client/apps/admin-e2e/project.json b/alfa-client/apps/admin-e2e/project.json
index 70c2587f76cc767b0a8483cb2166fe6da10852ec..35d6b9a5d2ee601526a9eae0295e6419844bb07a 100644
--- a/alfa-client/apps/admin-e2e/project.json
+++ b/alfa-client/apps/admin-e2e/project.json
@@ -4,7 +4,9 @@
   "projectType": "application",
   "sourceRoot": "apps/admin-e2e/src",
   "tags": [],
-  "implicitDependencies": ["admin"],
+  "implicitDependencies": [
+    "admin"
+  ],
   "targets": {
     "e2e": {
       "executor": "@nx/cypress:cypress",
@@ -24,14 +26,9 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "tsConfig": "apps/admin-e2e/tsconfig.json",
-        "passWithNoTests": false
-      }
+      "outputs": [
+        "{options.outputFile}"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/alfa-client/apps/alfa-e2e/project.json b/alfa-client/apps/alfa-e2e/project.json
index 691d783bd516cab473299de616ce4e8ad1541e5a..ae3416c9d988dccb3d411d5358e1c992e5b1c990 100644
--- a/alfa-client/apps/alfa-e2e/project.json
+++ b/alfa-client/apps/alfa-e2e/project.json
@@ -4,7 +4,9 @@
   "sourceRoot": "apps/alfa-e2e/src",
   "projectType": "application",
   "tags": [],
-  "implicitDependencies": ["alfa"],
+  "implicitDependencies": [
+    "alfa"
+  ],
   "targets": {
     "e2e": {
       "executor": "@nx/cypress:cypress",
@@ -22,14 +24,9 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "tsConfig": "apps/alfa-e2e/tsconfig.json",
-        "passWithNoTests": false
-      }
+      "outputs": [
+        "{options.outputFile}"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/alfa-client/apps/demo-e2e/project.json b/alfa-client/apps/demo-e2e/project.json
index 344327dfd1640da5e29a159a0599f61c126af285..2bd3f232bd8d105b281168a3be1ae10fb8d2e859 100644
--- a/alfa-client/apps/demo-e2e/project.json
+++ b/alfa-client/apps/demo-e2e/project.json
@@ -4,7 +4,9 @@
   "projectType": "application",
   "sourceRoot": "apps/demo-e2e/src",
   "tags": [],
-  "implicitDependencies": ["demo"],
+  "implicitDependencies": [
+    "demo"
+  ],
   "targets": {
     "e2e": {
       "executor": "@nx/cypress:cypress",
@@ -24,14 +26,9 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "tsConfig": "apps/demo-e2e/tsconfig.json",
-        "passWithNoTests": false
-      }
+      "outputs": [
+        "{options.outputFile}"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/incomming-mail/incomming-mail.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/incomming-mail/incomming-mail.component.spec.ts
index 235b8960aa5df952824e9b8a148fe60ce67ea503..bd8ee53f82deb4b3e3d5758d4e031418d8c43e68 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/incomming-mail/incomming-mail.component.spec.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list/postfach-mail/incomming-mail/incomming-mail.component.spec.ts
@@ -21,13 +21,13 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { ON_PAGE, PostfachMailLinkRel } from '@alfa-client/postfach-shared';
+import { FormatDateWithTimePipe, HasLinkPipe } from '@alfa-client/tech-shared';
+import { getElementFromFixture } from '@alfa-client/test-utils';
 import { registerLocaleData } from '@angular/common';
 import localeDe from '@angular/common/locales/de';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import { ON_PAGE, PostfachMailLinkRel } from '@alfa-client/postfach-shared';
-import { FormatDateWithTimePipe, HasLinkPipe } from '@alfa-client/tech-shared';
-import { getElementFromFixture } from '@alfa-client/test-utils';
 import { MockComponent } from 'ng-mocks';
 import { createPostfachMailResource } from '../../../../../../../postfach-shared/test/postfach';
 import { PostfachMailDateComponent } from '../postfach-mail-date/postfach-mail-date.component';
diff --git a/alfa-client/libs/ui/src/lib/icon/app-icon/app-icon.component.spec.ts b/alfa-client/libs/ui/src/lib/icon/app-icon/app-icon.component.spec.ts
index 9272b22e44a336ecf20fc009b2d40e36c516198d..03df1d64142c34009ab200254064e6ad12cc583b 100644
--- a/alfa-client/libs/ui/src/lib/icon/app-icon/app-icon.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/icon/app-icon/app-icon.component.spec.ts
@@ -32,8 +32,8 @@ describe('AppIconComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [MatIcon, AppIconComponent],
-      imports: [MatIconTestingModule],
+      declarations: [AppIconComponent],
+      imports: [MatIcon, MatIconTestingModule],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.spec.ts b/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.spec.ts
index 339ab141b7279bfa64c1f65fbe7d72d57d051744..483969a582da6a1b7da60ec4f43542a3ef64beba 100644
--- a/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.spec.ts
@@ -21,11 +21,11 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { getElementFromFixture } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatBadge, MatBadgeModule } from '@angular/material/badge';
 import { MatIcon } from '@angular/material/icon';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
-import { getElementFromFixture } from '@alfa-client/test-utils';
 import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
 import { PostfachIconComponent } from './postfach-icon.component';
 
@@ -37,8 +37,8 @@ describe('PostfachIconComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [MatIcon, PostfachIconComponent, MatBadge],
-      imports: [MatIconTestingModule, MatBadgeModule],
+      declarations: [PostfachIconComponent],
+      imports: [MatIconTestingModule, MatBadgeModule, MatBadge, MatIcon],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/ui/src/lib/snackbar/snackbar-close-button/snackbar-close-button.component.spec.ts b/alfa-client/libs/ui/src/lib/snackbar/snackbar-close-button/snackbar-close-button.component.spec.ts
index 82b41397c33bd9df3eca6f4588f24be53a0bd405..5656b44996f1cbd82c1e5d158c048c3941f2b6c6 100644
--- a/alfa-client/libs/ui/src/lib/snackbar/snackbar-close-button/snackbar-close-button.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/snackbar/snackbar-close-button/snackbar-close-button.component.spec.ts
@@ -21,9 +21,9 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { dispatchEventFromFixture, mock } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
-import { dispatchEventFromFixture, mock } from '@alfa-client/test-utils';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { EventEmitter } from 'stream';
 import { SnackbarCloseButtonComponent } from './snackbar-close-button.component';
@@ -36,7 +36,8 @@ describe('SnackbarCloseButtonComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [MatIcon, SnackbarCloseButtonComponent],
+      declarations: [SnackbarCloseButtonComponent],
+      imports: [MatIcon],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/ui/src/lib/ui/accordion/accordion.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/accordion/accordion.component.spec.ts
index 81bffb6716d20fa535b8a3fc31fb488a189661ad..da4310043468ee83deab1cddc97fccd18ab1fd50 100644
--- a/alfa-client/libs/ui/src/lib/ui/accordion/accordion.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/accordion/accordion.component.spec.ts
@@ -31,7 +31,8 @@ describe('AccordionComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [AccordionComponent, MatAccordion],
+      declarations: [AccordionComponent],
+      imports: [MatAccordion],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.spec.ts
index 14637e0618c43f0124d8462b7e2a848fcb4375da..f216b9a4171c9cb0f3bccde97f17b4d4d73b6bbf 100644
--- a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.spec.ts
@@ -1,8 +1,8 @@
+import { getElementFromFixture } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
 import { RouterTestingModule } from '@angular/router/testing';
 import faker from '@faker-js/faker';
-import { getElementFromFixture } from '@alfa-client/test-utils';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MatTooltipDirective } from 'libs/ui/src/lib/ui/mattooltip/mattooltip.directive';
 import { BackButtonComponent } from './back-button.component';
@@ -17,8 +17,8 @@ describe('BackButtonComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [BackButtonComponent, MatIcon, MatTooltipDirective],
-      imports: [RouterTestingModule],
+      declarations: [BackButtonComponent, MatTooltipDirective],
+      imports: [MatIcon, RouterTestingModule],
     }).compileComponents();
 
     fixture = TestBed.createComponent(BackButtonComponent);
diff --git a/alfa-client/libs/ui/src/lib/ui/button-toggle-group/button-toggle-group.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/button-toggle-group/button-toggle-group.component.spec.ts
index 56a6c81bfa66f12105dbeebfb815c41ad5159037..21fd42246c2d0c975ec2c1876fa952cd074fdeb3 100644
--- a/alfa-client/libs/ui/src/lib/ui/button-toggle-group/button-toggle-group.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/button-toggle-group/button-toggle-group.component.spec.ts
@@ -8,7 +8,8 @@ describe('ButtonToggleGroupComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ButtonToggleGroupComponent, MatButtonToggleGroup],
+      declarations: [ButtonToggleGroupComponent],
+      imports: [MatButtonToggleGroup],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ButtonToggleGroupComponent);
diff --git a/alfa-client/libs/ui/src/lib/ui/button-toggle/button-toggle.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/button-toggle/button-toggle.component.spec.ts
index e8c3d744fbee497f9819c5d46519d630111e8778..a1e682930d310bd5cbc30f33a082f3b35ca83ca1 100644
--- a/alfa-client/libs/ui/src/lib/ui/button-toggle/button-toggle.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/button-toggle/button-toggle.component.spec.ts
@@ -9,7 +9,8 @@ describe('ButtonToggleComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ButtonToggleComponent, MatButtonToggle, MatRipple],
+      declarations: [ButtonToggleComponent],
+      imports: [MatButtonToggle, MatRipple],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ButtonToggleComponent);
diff --git a/alfa-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.spec.ts
index dc7d5d86b61542444588704bfa6e82d646553dfe..8a321ccfb73298a3b120cfdd8d4aad31844bfab8 100644
--- a/alfa-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/expansion-panel/expansion-panel.component.spec.ts
@@ -39,15 +39,16 @@ describe('VorgangDetailExpansionPanelComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [BrowserAnimationsModule, PortalModule],
-      declarations: [
-        ExpansionPanelComponent,
+      imports: [
+        BrowserAnimationsModule,
+        PortalModule,
         MatExpansionPanel,
         MatExpansionPanelTitle,
         MatAccordion,
         MatIcon,
         MatExpansionPanelHeader,
       ],
+      declarations: [ExpansionPanelComponent],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.spec.ts
index 7ed131624203c896fb6a1adc5be5fd93525b28d3..4897f91529bff51d0a8380a562295f7fca403941 100644
--- a/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.component.spec.ts
@@ -22,8 +22,8 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatIcon } from '@angular/material/icon';
-import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { FixedDialogComponent } from './fixed-dialog.component';
 
 describe('FixedDialogComponent', () => {
@@ -32,8 +32,8 @@ describe('FixedDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MatDialogModule],
-      declarations: [FixedDialogComponent, MatIcon],
+      imports: [MatDialogModule, MatIcon],
+      declarations: [FixedDialogComponent],
       providers: [
         {
           provide: MatDialogRef,
diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-icon/ozgcloud-icon.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/ozgcloud-icon/ozgcloud-icon.component.spec.ts
index 5bee2df59ccb409bed55f0c53df19638a466897b..b7a822c2612ae39d39f08370d107cb77d9258288 100644
--- a/alfa-client/libs/ui/src/lib/ui/ozgcloud-icon/ozgcloud-icon.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-icon/ozgcloud-icon.component.spec.ts
@@ -8,7 +8,8 @@ describe('OzgcloudIconComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [OzgcloudIconComponent, MatIcon],
+      declarations: [OzgcloudIconComponent],
+      imports: [MatIcon],
     }).compileComponents();
 
     fixture = TestBed.createComponent(OzgcloudIconComponent);
diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-svgicon-big/ozgcloud-svgicon-big.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/ozgcloud-svgicon-big/ozgcloud-svgicon-big.component.spec.ts
index 4c8e75a14124586938db0ec5fe73436b9152d685..3d66ccd299dc8ffe10fb419c681621e72aff61e8 100644
--- a/alfa-client/libs/ui/src/lib/ui/ozgcloud-svgicon-big/ozgcloud-svgicon-big.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-svgicon-big/ozgcloud-svgicon-big.component.spec.ts
@@ -8,7 +8,8 @@ describe('OzgcloudSvgIconBigComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [OzgcloudSvgIconBigComponent, MatIcon],
+      declarations: [OzgcloudSvgIconBigComponent],
+      imports: [MatIcon],
     }).compileComponents();
 
     fixture = TestBed.createComponent(OzgcloudSvgIconBigComponent);
diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component.spec.ts
index bff8651ffd4d1d7b2e842404e9efa84704b6fcf2..6e2bf9488ac12a768e5995df82a887c8e2e2e4bd 100644
--- a/alfa-client/libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-svgicon/ozgcloud-svgicon.component.spec.ts
@@ -8,7 +8,8 @@ describe('OzgcloudSvgIconComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [OzgcloudSvgIconComponent, MatIcon],
+      declarations: [OzgcloudSvgIconComponent],
+      imports: [MatIcon],
     }).compileComponents();
 
     fixture = TestBed.createComponent(OzgcloudSvgIconComponent);
diff --git a/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts
index c71f231595ee4439b4a84002368d43bd567acae5..30bc917fbfbde187b82066687d88a8a2627d28a8 100644
--- a/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts
@@ -21,9 +21,9 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { createEmptyStateResource } from '@alfa-client/tech-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatProgressBar } from '@angular/material/progress-bar';
-import { createEmptyStateResource } from '@alfa-client/tech-shared';
 import { ProgressBarComponent } from './progress-bar.component';
 
 describe('ProgressBarComponent', () => {
@@ -34,7 +34,8 @@ describe('ProgressBarComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ProgressBarComponent, MatProgressBar],
+      declarations: [ProgressBarComponent],
+      imports: [MatProgressBar],
     });
   });
 
diff --git a/alfa-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.spec.ts
index 15c28f9a98d9fc31212b13df5e007921440f4e4d..fbbf1480130f7976d0ed19037265b1b8e73a0abb 100644
--- a/alfa-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/slide-toggle/slide-toggle.component.spec.ts
@@ -33,8 +33,8 @@ describe('SlideToggleComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MatRippleModule],
-      declarations: [SlideToggleComponent, MatTooltipDirective, MatSlideToggle],
+      imports: [MatRippleModule, MatSlideToggle],
+      declarations: [SlideToggleComponent, MatTooltipDirective],
     }).compileComponents();
 
     fixture = TestBed.createComponent(SlideToggleComponent);
diff --git a/alfa-client/libs/ui/src/lib/ui/spinner-transparency/spinner-transparency.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/spinner-transparency/spinner-transparency.component.spec.ts
index 62f9dfed608a6b4e31366f2d301f955d6ff621b0..0ea3b495fe6a66c23adac9b09d2434e97bd43cf3 100644
--- a/alfa-client/libs/ui/src/lib/ui/spinner-transparency/spinner-transparency.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/spinner-transparency/spinner-transparency.component.spec.ts
@@ -1,9 +1,9 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIcon } from '@angular/material/icon';
-import { MatSpinner } from '@angular/material/progress-spinner';
 import { createEmptyStateResource } from '@alfa-client/tech-shared';
 import { getElementFromFixture } from '@alfa-client/test-utils';
 import { SpinnerComponent } from '@alfa-client/ui';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatIcon } from '@angular/material/icon';
+import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
 import { SpinnerTransparencyComponent } from './spinner-transparency.component';
 
@@ -15,7 +15,8 @@ describe('SpinnerTransparencyComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [SpinnerTransparencyComponent, SpinnerComponent, MatIcon, MatSpinner],
+      declarations: [SpinnerTransparencyComponent, SpinnerComponent],
+      imports: [MatIcon, MatProgressSpinner],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts
index 0ee0f00ba00d9f9a5d56f3a93cdff1bc8ed9c4f5..58b2aad6e41721098048a12b519c0470e2ab1536 100644
--- a/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts
@@ -21,11 +21,11 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIcon } from '@angular/material/icon';
-import { MatSpinner } from '@angular/material/progress-spinner';
 import { createEmptyStateResource } from '@alfa-client/tech-shared';
 import { getElementFromFixture } from '@alfa-client/test-utils';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatIcon } from '@angular/material/icon';
+import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
 import { SpinnerComponent } from './spinner.component';
 
@@ -37,7 +37,8 @@ describe('SpinnerComponent', () => {
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      declarations: [SpinnerComponent, MatIcon, MatSpinner],
+      declarations: [SpinnerComponent],
+      imports: [MatIcon, MatProgressSpinner],
     });
   });
 
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-antragsteller/vorgang-detail-antragsteller.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-antragsteller/vorgang-detail-antragsteller.component.spec.ts
index 5d6dce139363b5c5c9971763584fd12ef373e5a7..9c8b7d908e8124ab85492f4f8c5c129b3b21e510 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-antragsteller/vorgang-detail-antragsteller.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-antragsteller/vorgang-detail-antragsteller.component.spec.ts
@@ -21,14 +21,14 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { EMPTY_STRING } from '@alfa-client/tech-shared';
+import { Antragsteller } from '@alfa-client/vorgang-shared';
 import { registerLocaleData } from '@angular/common';
 import localeDe from '@angular/common/locales/de';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatRipple } from '@angular/material/core';
 import { MatIcon } from '@angular/material/icon';
 import { MatList, MatListItem } from '@angular/material/list';
-import { EMPTY_STRING } from '@alfa-client/tech-shared';
-import { Antragsteller } from '@alfa-client/vorgang-shared';
 import { getElementFromFixture } from 'libs/test-utils/src/lib/helper';
 import { createAntragsteller } from 'libs/vorgang-shared/test/vorgang';
 import { VorgangDetailAntragstellerComponent } from './vorgang-detail-antragsteller.component';
@@ -54,7 +54,8 @@ describe('VorgangDetailAntragstellerComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [VorgangDetailAntragstellerComponent, MatIcon, MatList, MatListItem, MatRipple],
+      declarations: [VorgangDetailAntragstellerComponent],
+      imports: [MatIcon, MatList, MatListItem, MatRipple],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-abbrechen-button/vorgang-detail-bescheiden-abbrechen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-abbrechen-button/vorgang-detail-bescheiden-abbrechen-button.component.spec.ts
index 74392e5b99456b8df2ba1e688afbb077b1f5bc1a..88edfcc33994a41c77e6ef8e46d7a53e6637ea0b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-abbrechen-button/vorgang-detail-bescheiden-abbrechen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-abbrechen-button/vorgang-detail-bescheiden-abbrechen-button.component.spec.ts
@@ -15,7 +15,8 @@ describe('VorgangDetailBescheidenAbbrechenButtonComponent', () => {
     ozgcloudDialogService = mock(OzgcloudDialogService);
 
     await TestBed.configureTestingModule({
-      declarations: [VorgangDetailBescheidenAbbrechenButtonComponent, MatIcon],
+      declarations: [VorgangDetailBescheidenAbbrechenButtonComponent],
+      imports: [MatIcon],
       providers: [
         {
           provide: OzgcloudDialogService,
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.spec.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.spec.ts
index a132c63ec75151e104990c486307cdca393fca72..2f16944ecba83b737f8a187b9797991ea9810b93 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.spec.ts
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.spec.ts
@@ -21,11 +21,11 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { getElementFromFixture } from '@alfa-client/test-utils';
+import { VorgangResource } from '@alfa-client/vorgang-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIcon } from '@angular/material/icon';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
-import { getElementFromFixture } from '@alfa-client/test-utils';
-import { VorgangResource } from '@alfa-client/vorgang-shared';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MatTooltipDirective } from 'libs/ui/src/lib/ui/mattooltip/mattooltip.directive';
 import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -40,8 +40,8 @@ describe('VorgangNummerComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [MatIcon, MatTooltipDirective, VorgangNummerComponent],
-      imports: [MatIconTestingModule],
+      declarations: [MatTooltipDirective, VorgangNummerComponent],
+      imports: [MatIcon, MatIconTestingModule],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-clear-button/vorgang-search-clear-button.component.spec.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-clear-button/vorgang-search-clear-button.component.spec.ts
index 372d6c93ad5f6c8a7ce8f48969f5cad3f864550d..2b2889d21b4b86ef0eb4af6a3b179658fc74c827 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-clear-button/vorgang-search-clear-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search-clear-button/vorgang-search-clear-button.component.spec.ts
@@ -34,7 +34,8 @@ describe('VorgangSearchClearButtonComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [VorgangSearchClearButtonComponent, MatIcon],
+      declarations: [VorgangSearchClearButtonComponent],
+      imports: [MatIcon],
     }).compileComponents();
   });
 
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.spec.ts b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.spec.ts
index fe86ab911f7be375089bdf63f8c35b0d9cae286c..15a3f647fef8fbe83919d8c363bc3d5db5698cca 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.spec.ts
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-created-at/vorgang-created-at.component.spec.ts
@@ -21,11 +21,6 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { registerLocaleData } from '@angular/common';
-import localeDe from '@angular/common/locales/de';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIcon } from '@angular/material/icon';
-import { MatIconTestingModule } from '@angular/material/icon/testing';
 import {
   FormatDateWithTimePipe,
   FormatDateWithoutYearWithTimePipe,
@@ -33,6 +28,11 @@ import {
 } from '@alfa-client/tech-shared';
 import { getElementFromFixture } from '@alfa-client/test-utils';
 import { VorgangResource } from '@alfa-client/vorgang-shared';
+import { registerLocaleData } from '@angular/common';
+import localeDe from '@angular/common/locales/de';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatIcon } from '@angular/material/icon';
+import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MatTooltipDirective } from 'libs/ui/src/lib/ui/mattooltip/mattooltip.directive';
 import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -50,13 +50,12 @@ describe('VorgangCreatedAtComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [
-        MatIcon,
         MatTooltipDirective,
         FormatDateWithoutYearWithTimePipe,
         FormatDateWithTimePipe,
         VorgangCreatedAtComponent,
       ],
-      imports: [MatIconTestingModule],
+      imports: [MatIcon, MatIconTestingModule],
     }).compileComponents();
 
     fixture = TestBed.createComponent(VorgangCreatedAtComponent);
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/vorgang-filter-menu-item/vorgang-filter-menu-item.component.spec.ts b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/vorgang-filter-menu-item/vorgang-filter-menu-item.component.spec.ts
index c3cff3c5c7f4cc9d6d7a42c89d0060244a44a2aa..b5d3651aa36aa74601ffcf545b4f9234f58beb7d 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/vorgang-filter-menu-item/vorgang-filter-menu-item.component.spec.ts
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/vorgang-filter-menu-item/vorgang-filter-menu-item.component.spec.ts
@@ -8,7 +8,8 @@ describe('VorgangFilterMenuItemComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [VorgangFilterMenuItemComponent, MatIcon],
+      declarations: [VorgangFilterMenuItemComponent],
+      imports: [MatIcon],
     }).compileComponents();
 
     fixture = TestBed.createComponent(VorgangFilterMenuItemComponent);
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang-expand-button/wiedervorlage-in-vorgang-expand-button.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang-expand-button/wiedervorlage-in-vorgang-expand-button.component.spec.ts
index 1f6064162e05df12a11dbc7e48bab5f09c55cac8..0209d433221f381bf137b738ff1083cd4c3f9609 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang-expand-button/wiedervorlage-in-vorgang-expand-button.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang-expand-button/wiedervorlage-in-vorgang-expand-button.component.spec.ts
@@ -31,7 +31,8 @@ describe('WiedervorlageInVorgangExpandButtonComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [MatIcon, WiedervorlageInVorgangExpandButtonComponent],
+      declarations: [WiedervorlageInVorgangExpandButtonComponent],
+      imports: [MatIcon],
     }).compileComponents();
   });