diff --git a/test/specs/data_sources/index.ts b/test/specs/data_sources/index.ts
index 3f60bdb2b..b6eeaf565 100644
--- a/test/specs/data_sources/index.ts
+++ b/test/specs/data_sources/index.ts
@@ -6,6 +6,8 @@ import ComponentWrapper from '../../../src/dom_components/model/ComponentWrapper
 describe('DataSourceManager', () => {
   let em: Editor;
   let dsm: DataSourceManager;
+  let fixtures: HTMLElement;
+  let cmpRoot: ComponentWrapper;
   const dsTest: DataSourceProps = {
     id: 'ds1',
     records: [
@@ -23,6 +25,18 @@ describe('DataSourceManager', () => {
       avoidInlineStyle: true,
     });
     dsm = em.DataSources;
+    document.body.innerHTML = '<div id="fixtures"></div>';
+    const { Pages, Components } = em;
+    Pages.onLoad();
+    cmpRoot = Components.getWrapper()!;
+    const View = Components.getType('wrapper')!.view;
+    const wrapperEl = new View({
+      model: cmpRoot,
+      config: { ...cmpRoot.config, em },
+    });
+    wrapperEl.render();
+    fixtures = document.body.querySelector('#fixtures')!;
+    fixtures.appendChild(wrapperEl.el);
   });
 
   afterEach(() => {
@@ -33,47 +47,27 @@ describe('DataSourceManager', () => {
     expect(dsm).toBeTruthy();
   });
 
-  describe('Traits', () => {
-    let fixtures: HTMLElement;
-    let cmpRoot: ComponentWrapper;
-
-    beforeEach(() => {
-      document.body.innerHTML = '<div id="fixtures"></div>';
-      const { Pages, Components } = em;
-      Pages.onLoad();
-      cmpRoot = Components.getWrapper()!;
-      const View = Components.getType('wrapper')!.view;
-      const wrapperEl = new View({
-        model: cmpRoot,
-        config: { ...cmpRoot.config, em },
-      });
-      wrapperEl.render();
-      fixtures = document.body.querySelector('#fixtures')!;
-      fixtures.appendChild(wrapperEl.el);
-    });
-
-    test('add DataSource with records', () => {
-      const eventAdd = jest.fn();
-      em.on(dsm.events.add, eventAdd);
-      const ds = addDataSource();
-      expect(dsm.getAll().length).toBe(1);
-      expect(eventAdd).toBeCalledTimes(1);
-      expect(ds.getRecords().length).toBe(3);
-    });
+  test('add DataSource with records', () => {
+    const eventAdd = jest.fn();
+    em.on(dsm.events.add, eventAdd);
+    const ds = addDataSource();
+    expect(dsm.getAll().length).toBe(1);
+    expect(eventAdd).toBeCalledTimes(1);
+    expect(ds.getRecords().length).toBe(3);
+  });
 
-    test('get added DataSource', () => {
-      const ds = addDataSource();
-      expect(dsm.get(dsTest.id)).toBe(ds);
-    });
+  test('get added DataSource', () => {
+    const ds = addDataSource();
+    expect(dsm.get(dsTest.id)).toBe(ds);
+  });
 
-    test('remove DataSource', () => {
-      const event = jest.fn();
-      em.on(dsm.events.remove, event);
-      const ds = addDataSource();
-      dsm.remove('ds1');
-      expect(dsm.getAll().length).toBe(0);
-      expect(event).toBeCalledTimes(1);
-      expect(event).toBeCalledWith(ds, expect.any(Object));
-    });
+  test('remove DataSource', () => {
+    const event = jest.fn();
+    em.on(dsm.events.remove, event);
+    const ds = addDataSource();
+    dsm.remove('ds1');
+    expect(dsm.getAll().length).toBe(0);
+    expect(event).toBeCalledTimes(1);
+    expect(event).toBeCalledWith(ds, expect.any(Object));
   });
 });