diff --git a/alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts b/alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts
index ea311a2483d76f80252bd1da85172e1ec1e3fc0c..b1d9a7a6511203304b7367a91df208012eaf3070 100644
--- a/alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts
+++ b/alfa-client/libs/collaboration-shared/src/lib/organisations-einheit.service.spec.ts
@@ -1,7 +1,8 @@
 import { StateResource, createStateResource } from '@alfa-client/tech-shared';
 import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
 import faker from '@faker-js/faker';
-import { first, of } from 'rxjs';
+import { Observable, of } from 'rxjs';
+import { singleColdCompleted } from '../../../tech-shared/test/marbles';
 import {
   createOrganisationsEinheitListResource,
   createOrganisationsEinheitResource,
@@ -81,14 +82,13 @@ describe('OrganisationsEinheitService', () => {
       expect(searchService.getSelectedResult).toHaveBeenCalled();
     });
 
-    it('should return result', (done) => {
-      service
-        .getSelectedResult()
-        .pipe(first())
-        .subscribe((result: StateResource<OrganisationsEinheitResource>) => {
-          expect(result).toBe(organisationsEinheitStateResource);
-          done();
-        });
+    it('should return result', () => {
+      const selectedResult$: Observable<StateResource<OrganisationsEinheitResource>> =
+        service.getSelectedResult();
+
+      expect(selectedResult$).toBeObservable(
+        singleColdCompleted(organisationsEinheitStateResource),
+      );
     });
   });
 
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.spec.ts
index 13f0d0a62de651866ec28165f8b1855376c0fa47..49f71ddf4203ac77dd0d4f0aa2baa697d896706e 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.spec.ts
@@ -11,7 +11,7 @@ import { DialogConfig, DialogRef } from '@angular/cdk/dialog';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormControl } from '@angular/forms';
 import { getUrl } from '@ngxp/rest';
-import { ButtonComponent } from '@ods/system';
+import { ButtonComponent, OfficeIconComponent } from '@ods/system';
 import { createOrganisationsEinheitResource } from 'libs/collaboration-shared/test/organisations-einheit';
 import { SearchIconComponent } from 'libs/design-system/src/lib/icons/search-icon/search-icon.component';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -40,6 +40,7 @@ describe('OrganisationsEinheitContainerComponent', () => {
       declarations: [
         OrganisationsEinheitContainerComponent,
         MockComponent(SearchIconComponent),
+        MockComponent(OfficeIconComponent),
         MockComponent(ButtonComponent),
         MockComponent(OrganisationsEinheitComponent),
       ],
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource-search.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource-search.service.spec.ts
index d301de83a8ec8b77a0c5a7577eefbc3f91032c65..cec2eb392cca4a78a1ae77660048157d00169deb 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource-search.service.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource-search.service.spec.ts
@@ -4,7 +4,8 @@ import faker from '@faker-js/faker';
 import { Resource, getUrl } from '@ngxp/rest';
 import { DummyLinkRel } from 'libs/tech-shared/test/dummy';
 import { createDummyListResource, createDummyResource } from 'libs/tech-shared/test/resource';
-import { BehaviorSubject, first, of } from 'rxjs';
+import { BehaviorSubject, Observable, of } from 'rxjs';
+import { singleColdCompleted } from '../../../test/marbles';
 import { EMPTY_STRING } from '../tech.util';
 import { ResourceSearchService } from './resource-search.service';
 import { LinkRelationName, ListItemResource, SearchResourceServiceConfig } from './resource.model';
@@ -171,16 +172,11 @@ describe('ResourceSearchService', () => {
   describe('get selected', () => {
     const dummyStateResource: StateResource<Resource> = createStateResource(createDummyResource());
 
-    it('should return selected resource', (done) => {
-      service.selectedResource.next(dummyStateResource);
+    it('should return selected resource', () => {
+      service.getSelectedResult = jest.fn().mockReturnValue(of(dummyStateResource));
+      const selectedResult$: Observable<StateResource<Resource>> = service.getSelectedResult();
 
-      service
-        .getSelectedResult()
-        .pipe(first())
-        .subscribe((stateResource: StateResource<Resource>) => {
-          expect(dummyStateResource).toBe(stateResource);
-          done();
-        });
+      expect(selectedResult$).toBeObservable(singleColdCompleted(dummyStateResource));
     });
   });