diff --git a/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts
new file mode 100644
index 0000000000..e344765db4
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/tests/dynamic-layout.component.spec.ts
@@ -0,0 +1,151 @@
+import { ConfigState, CoreModule, DynamicLayoutComponent, eLayoutType, ABP, RouterOutletComponent } from '@abp/ng.core';
+import { Location } from '@angular/common';
+import { Component } from '@angular/core';
+import { createRoutingFactory, SpectatorRouting, SpyObject } from '@ngneat/spectator';
+import { NgxsModule, Store } from '@ngxs/store';
+import { LAYOUTS, ThemeBasicModule } from '../../../../theme-basic/src/public-api';
+import { OAuthService } from 'angular-oauth2-oidc';
+import { NgxsResetPluginModule, StateOverwrite } from 'ngxs-reset-plugin';
+import { ThemeSharedModule } from '../../../../theme-shared/src/public-api';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({ selector: 'dummy', template: '{{route.snapshot.data?.name}} works!' })
+class DummyComponent {
+  constructor(public route: ActivatedRoute) {}
+}
+
+describe('DynamicLayoutComponent', () => {
+  const createComponent = createRoutingFactory({
+    component: RouterOutletComponent,
+    declareComponent: false,
+    imports: [
+      CoreModule,
+      NgxsModule.forRoot([ConfigState]),
+      NgxsResetPluginModule.forRoot(),
+      ThemeSharedModule.forRoot(),
+      ThemeBasicModule,
+    ],
+    declarations: [DummyComponent],
+    stubsEnabled: false,
+    providers: [{ provide: OAuthService, useValue: { getAccessToken: () => true } }],
+    routes: [
+      { path: '', component: RouterOutletComponent },
+      {
+        path: 'parentWithLayout',
+        component: DynamicLayoutComponent,
+        children: [
+          {
+            path: 'childWithoutLayout',
+            component: DummyComponent,
+            data: { name: 'childWithoutLayout' },
+          },
+          {
+            path: 'childWithLayout',
+            component: DummyComponent,
+            data: { name: 'childWithLayout' },
+          },
+        ],
+      },
+      {
+        path: 'withData',
+        component: DynamicLayoutComponent,
+        children: [
+          {
+            path: '',
+            component: DummyComponent,
+            data: { name: 'withData' },
+          },
+        ],
+        data: { layout: eLayoutType.empty },
+      },
+      {
+        path: 'withoutLayout',
+        component: DynamicLayoutComponent,
+        children: [
+          {
+            path: '',
+            component: DummyComponent,
+            data: { name: 'withoutLayout' },
+          },
+        ],
+        data: { layout: null },
+      },
+    ],
+  });
+
+  let spectator: SpectatorRouting<RouterOutletComponent>;
+  let store: SpyObject<Store>;
+
+  beforeEach(async () => {
+    spectator = createComponent();
+    store = spectator.get(Store);
+    store.dispatch(
+      new StateOverwrite([
+        ConfigState,
+        {
+          requirements: { layouts: LAYOUTS },
+          routes: [
+            {
+              path: '',
+              wrapper: true,
+              children: [
+                {
+                  path: 'parentWithLayout',
+                  layout: eLayoutType.application,
+                  children: [{ path: 'childWithoutLayout' }, { path: 'childWithLayout', layout: eLayoutType.account }],
+                },
+              ],
+            },
+            { path: 'withData', layout: eLayoutType.application },
+            ,
+          ] as ABP.FullRoute[],
+          environment: { application: {} },
+        },
+      ]),
+    );
+  });
+
+  it('should handle application layout from parent abp route and display it', async () => {
+    spectator.router.navigateByUrl('/parentWithLayout/childWithoutLayout');
+    await spectator.fixture.whenStable();
+    spectator.detectComponentChanges();
+    expect(spectator.query('abp-dynamic-layout')).toBeTruthy();
+    expect(spectator.query('abp-layout-application')).toBeTruthy();
+  });
+
+  it('should handle account layout from own property and display it', async () => {
+    spectator.router.navigateByUrl('/parentWithLayout/childWithLayout');
+    await spectator.fixture.whenStable();
+    spectator.detectComponentChanges();
+    expect(spectator.query('abp-layout-account')).toBeTruthy();
+  });
+
+  it('should handle empty layout from route data and display it', async () => {
+    spectator.router.navigateByUrl('/withData');
+    await spectator.fixture.whenStable();
+    spectator.detectComponentChanges();
+    expect(spectator.query('abp-layout-empty')).toBeTruthy();
+  });
+
+  it('should display empty layout when layout is null', async () => {
+    spectator.router.navigateByUrl('/withoutLayout');
+    await spectator.fixture.whenStable();
+    spectator.detectComponentChanges();
+    expect(spectator.query('abp-layout-empty')).toBeTruthy();
+  });
+
+  it('should not display any layout when layouts are empty', async () => {
+    store.dispatch(
+      new StateOverwrite([ConfigState, { ...store.selectSnapshot(ConfigState), requirements: { layouts: [] } }]),
+    );
+
+    spectator.detectChanges();
+
+    spectator.router.navigateByUrl('/withoutLayout');
+    await spectator.fixture.whenStable();
+    spectator.detectComponentChanges();
+
+    expect(spectator.query('abp-layout-empty')).toBeFalsy();
+    expect(spectator.query('abp-dynamic-layout').children[0].tagName).toEqual('ROUTER-OUTLET');
+  });
+});
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
index 5aa737cb4f..835f4a33a9 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
@@ -1,8 +1,7 @@
-import { ConfigState, CoreModule, RestOccurError, RouterOutletComponent } from '@abp/ng.core';
+import { CoreModule, RestOccurError, RouterOutletComponent } from '@abp/ng.core';
 import { Location } from '@angular/common';
 import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
 import { Component } from '@angular/core';
-import { RouterModule } from '@angular/router';
 import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator';
 import { RouterState } from '@ngxs/router-plugin';
 import { NgxsModule, Store } from '@ngxs/store';