diff --git a/client-v2/src/app/components/organisms/entity-view/views/tasklist-view/tasklist-view.component.test.ts b/client-v2/src/app/components/organisms/entity-view/views/tasklist-view/tasklist-view.component.test.ts
index 8e70c4e0..13270822 100644
--- a/client-v2/src/app/components/organisms/entity-view/views/tasklist-view/tasklist-view.component.test.ts
+++ b/client-v2/src/app/components/organisms/entity-view/views/tasklist-view/tasklist-view.component.test.ts
@@ -1,6 +1,6 @@
 import { CdkMenuModule } from '@angular/cdk/menu'
 import { testName } from 'cypress/support/helpers'
-import { BehaviorSubject } from 'rxjs'
+import { BehaviorSubject, of } from 'rxjs'
 import { EntityPageLabelComponent } from 'src/app/components/atoms/entity-page-label/entity-page-label.component'
 import { DropDownComponent } from 'src/app/components/molecules/drop-down/drop-down.component'
 import { EditableEntityNameComponent } from 'src/app/components/molecules/editable-entity-heading/editable-entity-name.component'
@@ -8,11 +8,21 @@ import { FocusableDirective } from 'src/app/directives/focusable.directive'
 import { MutationDirective } from 'src/app/directives/mutation.directive'
 import { EntityPreviewRecursive } from 'src/app/models/entities.model'
 import { TasklistDetail } from 'src/app/models/list.model'
+import { TaskTreeMap } from 'src/app/store/entities/entities.state'
 import { actionsMock, storeMock } from 'src/app/utils/unit-test.mocks'
 import { EntityViewComponent, EntityViewData, ENTITY_VIEW_DATA } from '../../entity-view.component'
 import { TasklistViewComponent } from './tasklist-view.component'
 
-const setupComponent = (viewData: EntityViewData<TasklistDetail>) => {
+const setupComponent = (viewData: EntityViewData<TasklistDetail>, taskTreeMap: TaskTreeMap = {}) => {
+    const store = {
+        ...storeMock,
+        useValue: {
+            ...storeMock.useValue,
+            select() {
+                return of(taskTreeMap)
+            },
+        },
+    }
     cy.mount(`<app-tasklist-view></app-tasklist-view> `, {
         componentProperties: {},
         imports: [CdkMenuModule],
@@ -26,7 +36,7 @@ const setupComponent = (viewData: EntityViewData<TasklistDetail>) => {
         ],
         providers: [
             { provide: ENTITY_VIEW_DATA, useValue: viewData },
-            storeMock,
+            store,
             { provide: EntityViewComponent, useValue: { progress$: new BehaviorSubject<number | null>(null) } },
             actionsMock,
         ],
diff --git a/client-v2/src/app/store/entities/entities.state.ts b/client-v2/src/app/store/entities/entities.state.ts
index ec6c95f2..14c36e8a 100644
--- a/client-v2/src/app/store/entities/entities.state.ts
+++ b/client-v2/src/app/store/entities/entities.state.ts
@@ -1,11 +1,12 @@
 import { EntityPreviewRecursive, EntityType } from 'src/app/models/entities.model'
 import { TasklistDetail } from 'src/app/models/list.model'
-import { TaskPreview } from 'src/app/models/task.model'
+
+export type TaskTreeMap = Record<string, TaskPreview[]>
 
 export interface EntitiesState {
     entityTree: EntityPreviewRecursive[] | null
     /** Mapped to their tasklist */
-    taskTreeMap: Record<string, TaskPreview[]> | null // @TODO: should be tht recursive version
+    taskTreeMap: TaskTreeMap | null // @TODO: should be tht recursive version
 
     [EntityType.TASKLIST]: Record<string, TasklistDetail> | null
     // @TODO: This makes more sense