diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
index 7c2cc013b2..361ec0c020 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
@@ -22,7 +22,7 @@ describe('ConfirmationService', () => {
   let service: ConfirmationService;
   const createComponent = createComponentFactory({
     component: DummyComponent,
-    imports: [CoreModule, ThemeSharedModule, NgxsModule.forRoot(), RouterTestingModule],
+    imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule],
     providers: [MessageService],
   });
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
index a22dd75000..08656ff2d7 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
@@ -77,18 +77,21 @@ describe('ModalComponent', () => {
     expect(disappearFn).toHaveBeenCalled();
   });
 
-  it('should open the confirmation popup and works correct', () => {
-    spectator.click('#abp-modal-close-button');
-    expect(disappearFn).not.toHaveBeenCalled();
+  it('should open the confirmation popup and works correct', done => {
+    setTimeout(() => {
+      spectator.click('#abp-modal-close-button');
+      expect(disappearFn).not.toHaveBeenCalled();
 
-    expect(spectator.query('p-toast')).toBeTruthy();
-    spectator.click('button#cancel');
-    expect(spectator.query('div.modal')).toBeTruthy();
+      expect(spectator.query('p-toast')).toBeTruthy();
+      spectator.click('button#cancel');
+      expect(spectator.query('div.modal')).toBeTruthy();
 
-    spectator.click('#abp-modal-close-button');
-    spectator.click('button#confirm');
-    expect(spectator.query('div.modal')).toBeFalsy();
-    expect(disappearFn).toHaveBeenCalled();
+      spectator.click('#abp-modal-close-button');
+      spectator.click('button#confirm');
+      expect(spectator.query('div.modal')).toBeFalsy();
+      expect(disappearFn).toHaveBeenCalled();
+      done();
+    }, 100);
   });
 
   it('should close with the abpClose', done => {
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
index d8f97c28b2..149ecd1fad 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
@@ -1,12 +1,11 @@
 import { CoreModule } from '@abp/ng.core';
 import { Component } from '@angular/core';
+import { RouterTestingModule } from '@angular/router/testing';
 import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
 import { NgxsModule } from '@ngxs/store';
+import { MessageService } from 'primeng/components/common/messageservice';
 import { ToasterService } from '../services/toaster.service';
 import { ThemeSharedModule } from '../theme-shared.module';
-import { RouterModule } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
-import { MessageService } from 'primeng/components/common/messageservice';
 
 @Component({
   selector: 'abp-dummy',
@@ -23,7 +22,7 @@ describe('ToasterService', () => {
   let service: ToasterService;
   const createComponent = createComponentFactory({
     component: DummyComponent,
-    imports: [CoreModule, ThemeSharedModule, NgxsModule.forRoot(), RouterTestingModule],
+    imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule],
     providers: [MessageService],
   });
 
@@ -63,7 +62,10 @@ describe('ToasterService', () => {
   });
 
   it('should display multiple toasts', () => {
-    service.addAll([{ summary: 'summary1', detail: 'detail1' }, { summary: 'summary2', detail: 'detail2' }]);
+    service.addAll([
+      { summary: 'summary1', detail: 'detail1' },
+      { summary: 'summary2', detail: 'detail2' },
+    ]);
     spectator.detectChanges();
     expect(spectator.queryAll('div.ui-toast-summary').map(node => node.textContent.trim())).toEqual([
       'summary1',