diff --git a/alfa-client/apps/admin/src/app/app.component.spec.ts b/alfa-client/apps/admin/src/app/app.component.spec.ts
index f0849bfe3e6898eeb941f3572ba9ff263a006df9..6388a21f39a29e02d2634e60f95d3209b88fbbad 100644
--- a/alfa-client/apps/admin/src/app/app.component.spec.ts
+++ b/alfa-client/apps/admin/src/app/app.component.spec.ts
@@ -131,17 +131,17 @@ describe('AppComponent', () => {
       });
 
       it('should call removeAuthenticationParams', () => {
-        component.removeAuthenticationParams = jest.fn();
+        component.forwardWithoutAuthenticationParams = jest.fn();
 
         component.doAfterLoggedIn();
 
-        expect(component.removeAuthenticationParams).toHaveBeenCalled();
+        expect(component.forwardWithoutAuthenticationParams).toHaveBeenCalled();
       });
     });
 
-    describe('removeAuthenticationParams', () => {
+    describe('forward without authentication params', () => {
       it('should navigate to same route without authentication params', () => {
-        component.removeAuthenticationParams();
+        component.forwardWithoutAuthenticationParams();
 
         expect(router.navigate).toHaveBeenCalledWith([], { queryParams: {} });
       });
diff --git a/alfa-client/apps/admin/src/app/app.component.ts b/alfa-client/apps/admin/src/app/app.component.ts
index 48bd89bfa5c91ccbf7fa364250662e6a326e16e6..e1d4c6d2a424c489756ec2966dde744126e360fa 100644
--- a/alfa-client/apps/admin/src/app/app.component.ts
+++ b/alfa-client/apps/admin/src/app/app.component.ts
@@ -28,10 +28,10 @@ export class AppComponent implements OnInit {
 
   doAfterLoggedIn(): void {
     this.apiRootStateResource$ = this.apiRootService.getApiRoot();
-    this.removeAuthenticationParams();
+    this.forwardWithoutAuthenticationParams();
   }
 
-  removeAuthenticationParams() {
+  forwardWithoutAuthenticationParams() {
     const queryParams = this.getQueryParamsWithoutAuthentication();
     this.router.navigate([], { queryParams });
   }
diff --git a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
index ad4f7bd11d40c6444ba2fdbbc169cd0b81aff0f4..86d331e417dd25431571427af73a542672943420 100644
--- a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
+++ b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
@@ -9,7 +9,6 @@ import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
 import { createInvalidParam, createProblemDetail } from '../../../../../../../tech-shared/test/error';
 import { createAdminOrganisationsEinheitResource } from '../../../../../test/organisations-einheit/organisations-einheit';
-import { TextFieldComponent } from '../../../shared/text-field/text-field.component';
 import { OrganisationsEinheitService } from '../../organisationseinheit.service';
 import { OrganisationsEinheitFormComponent } from './organisationseinheit-form.component';
 import { OrganisationsEinheitSignaturComponent } from './organisationseinheit-signatur/organisationseinheit-signatur.component';
@@ -31,7 +30,6 @@ describe('OrganisationsEinheitFormComponent', () => {
     await TestBed.configureTestingModule({
       declarations: [
         OrganisationsEinheitFormComponent,
-        MockComponent(TextFieldComponent),
         MockComponent(OrganisationsEinheitSignaturComponent),
         MockComponent(ButtonWithSpinnerComponent),
       ],
diff --git a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts
index 8c8096d7df647918130510a8ac0fad54499064f7..119bf30d3ed7cac949543b020412c62a50e079f5 100644
--- a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts
+++ b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts
@@ -9,7 +9,6 @@ import { singleCold } from 'libs/tech-shared/test/marbles';
 import { MockComponent } from 'ng-mocks';
 import { EMPTY } from 'rxjs';
 import { createPostfachResource } from '../../../../../test/postfach/postfach';
-import { TextFieldComponent } from '../../../shared/text-field/text-field.component';
 import { PostfachResource } from '../../postfach.model';
 import { PostfachService } from '../../postfach.service';
 import { PostfachFormComponent } from './postfach-form.component';
@@ -28,12 +27,7 @@ describe('PostfachFormComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [
-        PostfachFormComponent,
-        MockComponent(TextFieldComponent),
-        MockComponent(PostfachSignaturComponent),
-        MockComponent(ButtonWithSpinnerComponent),
-      ],
+      declarations: [PostfachFormComponent, MockComponent(PostfachSignaturComponent), MockComponent(ButtonWithSpinnerComponent)],
       imports: [ReactiveFormsModule, FormsModule],
       providers: [
         {