diff --git a/alfa-client/libs/api-root-shared/src/lib/api-root.service.spec.ts b/alfa-client/libs/api-root-shared/src/lib/api-root.service.spec.ts
index 3b6aec231b071a2237cb64bb74efbd83ce41e0cd..557766ea0c2423c63d1d249548489dcbbeee0001 100644
--- a/alfa-client/libs/api-root-shared/src/lib/api-root.service.spec.ts
+++ b/alfa-client/libs/api-root-shared/src/lib/api-root.service.spec.ts
@@ -28,17 +28,17 @@ import {
   StateResource,
 } from '@alfa-client/tech-shared';
 import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { fakeAsync, tick } from '@angular/core/testing';
 import { getUrl } from '@ngxp/rest';
 import { cold, hot } from 'jest-marbles';
 import { Observable, of } from 'rxjs';
 import { createBinaryFileResource } from '../../../binary-file-shared/test/binary-file';
+import { singleCold } from '../../../tech-shared/test/marbles';
 import { createApiRootResource } from '../../test/api-root';
 import { ApiRootFacade } from './+state/api-root.facade';
 import { ApiRootResource } from './api-root.model';
 import { ApiRootRepository } from './api-root.repository';
 import { ApiRootService } from './api-root.service';
-import { singleCold } from '../../../tech-shared/src/lib/resource/marbles';
-import { fakeAsync, tick } from '@angular/core/testing';
 
 describe('ApiRootService', () => {
   let service: ApiRootService;
diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
index 446d3d2ac83f7afef9b8455ae2ce25fe741d6035..19cd002222b625f513309a5bf98a72aa9a982e7f 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
@@ -582,11 +582,13 @@ describe('BescheidService', () => {
     const bescheidResource: BescheidResource = createBescheidResource();
 
     const createCommandProps: CreateCommandProps = createCreateCommandProps();
-    const buildUpdateBescheidCommandPropsSpy: jest.SpyInstance = jest
-      .spyOn(BescheidUtil, 'buildUpdateBescheidCommandProps')
-      .mockReturnValue(createCommandProps);
+    let buildUpdateBescheidCommandPropsSpy: jest.SpyInstance;
 
     beforeEach(() => {
+      buildUpdateBescheidCommandPropsSpy = jest
+        .spyOn(BescheidUtil, 'buildUpdateBescheidCommandProps')
+        .mockReturnValue(createCommandProps);
+      commandService.createCommandByProps.mockClear();
       commandService.createCommandByProps.mockReturnValue(
         of(createStateResource(createCommandResource())),
       );
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
index cacfe8689e1b09b653c2f2f82de5a0b856501d57..f93a84e663ec4a59ba867e0692996e2d35a4a54c 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
@@ -32,7 +32,7 @@ import {
 } from '../../../../../bescheid-shared/src/test/bescheid';
 import { createDocumentResource } from '../../../../../bescheid-shared/src/test/document';
 import { createBinaryFileResource } from '../../../../../binary-file-shared/test/binary-file';
-import { singleCold } from '../../../../../tech-shared/src/lib/resource/marbles';
+import { singleCold } from '../../../../../tech-shared/test/marbles';
 import { createVorgangWithEingangResource } from '../../../../../vorgang-shared/test/vorgang';
 import { BescheidenFormService } from './bescheiden.formservice';
 
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.spec.ts
index 080523dac6a3ee225bf761bd66db45f3da905db6..7a892cb44c19c0b3826281b874991630930ff336 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.spec.ts
@@ -17,9 +17,9 @@ import { OzgcloudSvgIconComponent } from 'libs/ui/src/lib/ui/ozgcloud-svgicon/oz
 import { MockComponent } from 'ng-mocks';
 import { EMPTY, of } from 'rxjs';
 import { createDocumentResource } from '../../../../../../../bescheid-shared/src/test/document';
-import { singleColdCompleted } from '../../../../../../../tech-shared/src/lib/resource/marbles';
 import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
 import { createApiError } from '../../../../../../../tech-shared/test/error';
+import { singleColdCompleted } from '../../../../../../../tech-shared/test/marbles';
 import { BescheidenFormService } from '../../bescheiden.formservice';
 import { VorgangDetailBescheidenResultNachrichtComponent } from './vorgang-detail-bescheiden-result-nachricht.component';
 
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.spec.ts
index 6badf72f68d20175d5508cea4bdd920f2b4b96cf..f7e34ae86863501f2e8813356eb47de37d87653a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.spec.ts
@@ -21,7 +21,7 @@ import { createCommandResource } from 'libs/command-shared/test/command';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent } from 'ng-mocks';
 import { BehaviorSubject, EMPTY, first, of } from 'rxjs';
-import { singleColdCompleted } from '../../../../../../tech-shared/src/lib/resource/marbles';
+import { singleColdCompleted } from '../../../../../../tech-shared/test/marbles';
 import { BescheidenFormService } from '../bescheiden.formservice';
 import { VorgangDetailBescheidenResultAttachmentsComponent } from './vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component';
 import { VorgangDetailBescheidenResultDokumentComponent } from './vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component';
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-steps-content.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-steps-content.component.spec.ts
index 5a2d05a8c865f4b021f187f37beaa2326b2059ee..6559c97674ad9b2fee5258fd64835cff365ff99f 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-steps-content.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-steps-content.component.spec.ts
@@ -15,8 +15,8 @@ import {
   createCommandResource,
   createCommandStateResource,
 } from '../../../../../../../command-shared/test/command';
-import { singleCold } from '../../../../../../../tech-shared/src/lib/resource/marbles';
 import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
+import { singleCold } from '../../../../../../../tech-shared/test/marbles';
 import { createVorgangWithEingangResource } from '../../../../../../../vorgang-shared/test/vorgang';
 import { BescheidenFormService } from '../../bescheiden.formservice';
 import { VorgangDetailBescheidenStepTitleComponent } from '../vorgang-detail-bescheiden-step-title/vorgang-detail-bescheiden-step-title.component';