diff --git a/test/specs/data_sources/index.ts b/test/specs/data_sources/index.ts
index b6eeaf565..97caa9a56 100644
--- a/test/specs/data_sources/index.ts
+++ b/test/specs/data_sources/index.ts
@@ -1,7 +1,7 @@
 import Editor from '../../../src/editor/model/Editor';
 import DataSourceManager from '../../../src/data_sources';
-import { DataSourceProps } from '../../../src/data_sources/types';
 import ComponentWrapper from '../../../src/dom_components/model/ComponentWrapper';
+import { DataSourceProps } from '../../../src/data_sources/model/DataSource';
 
 describe('DataSourceManager', () => {
   let em: Editor;
diff --git a/test/specs/data_sources/model/ComponentDataVariable.ts b/test/specs/data_sources/model/ComponentDataVariable.ts
index 7626fb711..20dba86f3 100644
--- a/test/specs/data_sources/model/ComponentDataVariable.ts
+++ b/test/specs/data_sources/model/ComponentDataVariable.ts
@@ -1,9 +1,10 @@
 import Editor from '../../../../src/editor/model/Editor';
 import DataSourceManager from '../../../../src/data_sources';
-import { DataSourceProps, DataSourcesEvents } from '../../../../src/data_sources/types';
+import { DataSourcesEvents } from '../../../../src/data_sources/types';
 import ComponentWrapper from '../../../../src/dom_components/model/ComponentWrapper';
 import ComponentDataVariable from '../../../../src/data_sources/model/ComponentDataVariable';
 import { DataVariableType } from '../../../../src/data_sources/model/DataVariable';
+import { DataSourceProps } from '../../../../src/data_sources/model/DataSource';
 
 describe('ComponentDataVariable', () => {
   let em: Editor;
diff --git a/test/specs/data_sources/model/StyleDataVariable.ts b/test/specs/data_sources/model/StyleDataVariable.ts
index 44634be73..ad453760f 100644
--- a/test/specs/data_sources/model/StyleDataVariable.ts
+++ b/test/specs/data_sources/model/StyleDataVariable.ts
@@ -1,8 +1,8 @@
 import Editor from '../../../../src/editor/model/Editor';
 import DataSourceManager from '../../../../src/data_sources';
-import { DataSourceProps } from '../../../../src/data_sources/types';
 import ComponentWrapper from '../../../../src/dom_components/model/ComponentWrapper';
 import { DataVariableType } from '../../../../src/data_sources/model/DataVariable';
+import { DataSourceProps } from '../../../../src/data_sources/model/DataSource';
 
 describe('StyleDataVariable', () => {
   let em: Editor;
diff --git a/test/specs/data_sources/model/TraitDataVariable.ts b/test/specs/data_sources/model/TraitDataVariable.ts
index 1d5b828ba..3f9704142 100644
--- a/test/specs/data_sources/model/TraitDataVariable.ts
+++ b/test/specs/data_sources/model/TraitDataVariable.ts
@@ -1,8 +1,8 @@
 import Editor from '../../../../src/editor/model/Editor';
 import DataSourceManager from '../../../../src/data_sources';
-import { DataSourceProps } from '../../../../src/data_sources/types';
 import ComponentWrapper from '../../../../src/dom_components/model/ComponentWrapper';
 import { DataVariableType } from '../../../../src/data_sources/model/DataVariable';
+import { DataSourceProps } from '../../../../src/data_sources/model/DataSource';
 
 describe('TraitDataVariable', () => {
   let em: Editor;
diff --git a/test/specs/data_sources/serialization.ts b/test/specs/data_sources/serialization.ts
index 7123977f3..117468d1e 100644
--- a/test/specs/data_sources/serialization.ts
+++ b/test/specs/data_sources/serialization.ts
@@ -1,10 +1,10 @@
 import Editor from '../../../src/editor';
 import DataSourceManager from '../../../src/data_sources';
-import { DataSourceProps } from '../../../src/data_sources/types';
 import ComponentWrapper from '../../../src/dom_components/model/ComponentWrapper';
 import { DataVariableType } from '../../../src/data_sources/model/DataVariable';
 import EditorModel from '../../../src/editor/model/Editor';
 import { ProjectData } from '../../../src/storage_manager';
+import { DataSourceProps } from '../../../src/data_sources/model/DataSource';
 
 // Filter out the unique ids and selectors replaced with 'data-variable-id'
 // Makes the snapshot more stable
diff --git a/test/specs/data_sources/transformers.ts b/test/specs/data_sources/transformers.ts
index 00290e5f3..0b4f03c39 100644
--- a/test/specs/data_sources/transformers.ts
+++ b/test/specs/data_sources/transformers.ts
@@ -1,8 +1,8 @@
 import Editor from '../../../src/editor/model/Editor';
 import DataSourceManager from '../../../src/data_sources';
-import { DataSourceProps } from '../../../src/data_sources/types';
 import ComponentWrapper from '../../../src/dom_components/model/ComponentWrapper';
 import { DataVariableType } from '../../../src/data_sources/model/DataVariable';
+import { DataSourceProps } from '../../../src/data_sources/model/DataSource';
 
 describe('DataSource Transformers', () => {
   let em: Editor;