diff --git a/cypress/integration/cell.js b/cypress/integration/cell.js
new file mode 100644
index 0000000..f48f078
--- /dev/null
+++ b/cypress/integration/cell.js
@@ -0,0 +1,84 @@
+describe('Cell', function () {
+    before(function () {
+        cy.visit('/');
+    });
+
+    it('focuses cell on click', function () {
+        cy.clickCell(2, 0)
+            .should('have.class', 'dt-cell--focus');
+    });
+
+    it('not focuses cell which are not focusable', function () {
+        cy.clickCell(1, 0)
+            .should('not.have.class', 'dt-cell--focus');
+    });
+
+    it('edit cell on enter press', function () {
+        cy.getCell(4, 0).type('{enter}')
+            .should('have.class', 'dt-cell--editing')
+            .type('{enter}')
+            .should('not.have.class', 'dt-cell--editing');
+    });
+
+    it('edit cell on double click', function () {
+        cy.getCell(4, 0)
+            .as('target')
+            .dblclick({ force: true })
+            .should('have.class', 'dt-cell--editing');
+
+        cy.clickCell(3, 0);
+
+        cy.get('@target').should('not.have.class', 'dt-cell--editing');
+    });
+
+    it('edit cell', function () {
+        cy.getCell(4, 1).dblclick();
+        cy.getCell(4, 1).find('input').click();
+        cy.focused().type('{selectall}{del}Test{enter}');
+        cy.getCell(4, 1).contains('Test');
+    });
+
+    it('if editing is false: editing should not activate', function () {
+        cy.getCell(3, 0).dblclick({ force: true })
+            .should('not.have.class', 'dt-cell--editing');
+    });
+
+    it('navigation using arrow keys', function () {
+        cy.clickCell(2, 0)
+            .type('{rightarrow}');
+
+        cy.get('.dt-cell--focus')
+            .should('have.class', 'dt-cell--3-0')
+            .click({ force: true })
+            .type('{downarrow}');
+
+        cy.get('.dt-cell--focus')
+            .should('have.class', 'dt-cell--3-1');
+        // TODO: test navigation over hidden rows
+    });
+
+    it('navigation using ctrl + arrow keys', function () {
+        cy.clickCell(2, 0)
+            .type('{ctrl}{rightarrow}');
+        cy.get('.dt-cell--focus')
+            .should('have.class', 'dt-cell--7-0');
+    });
+
+    it('cell selection using shift + arrow keys', function () {
+        cy.getCell(2, 1)
+            .type('{shift}{rightarrow}{rightarrow}{downarrow}');
+
+        // 6 cells and 2 headers
+        cy.get('.dt-cell--highlight').should('have.length', 6 + 2);
+
+        cy.clickCell(2, 0);
+    });
+
+    it('mouse selection', function () {
+        // TODO:
+        // cy.getCell(2, 1)
+        //     .trigger('mousedown', { which: 1, pageX: 331, pageY: 207, force: true })
+        //     .trigger('mousemove', { which: 1, pageX: 489, pageY: 312 })
+        //     .trigger('mouseup');
+    });
+});
\ No newline at end of file
diff --git a/cypress/integration/column.js b/cypress/integration/column.js
new file mode 100644
index 0000000..ccf0d10
--- /dev/null
+++ b/cypress/integration/column.js
@@ -0,0 +1,46 @@
+describe('Column', function () {
+    before(function () {
+        cy.visit('/');
+    });
+
+    it('header dropdown toggles on click', function () {
+        cy.getColumnCell(2)
+            .find('.dt-dropdown__toggle')
+            .as('toggle')
+            .click();
+        cy.get('.dt-dropdown__list')
+            .as('dropdown-list')
+            .should('be.visible');
+
+        cy.getColumnCell(2).click();
+
+        cy.get('@dropdown-list').should('not.be.visible');
+    });
+
+    it('sort ascending button should work', function () {
+        cy.clickDropdown(2);
+        cy.clickDropdownItem(2, 'Sort Ascending');
+
+        cy.window().then(win => win.datatable.getColumn(2))
+            .its('sortOrder')
+            .should('eq', 'asc');
+
+        cy.window().then(win => win.datatable.datamanager)
+            .its('currentSort.colIndex')
+            .should('eq', 2);
+
+        cy.get('.dt-scrollable .dt-row:first')
+            .contains('Airi Satou');
+
+        cy.clickDropdownItem(2, 'Reset sorting');
+    });
+
+    it('removes column using dropdown action', function () {
+        cy.get('.dt-cell--header').should('have.length', 8);
+
+        cy.clickDropdown(5);
+        cy.clickDropdownItem(5, 'Remove column');
+
+        cy.get('.dt-cell--header').should('have.length', 7);
+    });
+});
diff --git a/cypress/integration/datatable_spec.js b/cypress/integration/datatable_spec.js
deleted file mode 100644
index bae200c..0000000
--- a/cypress/integration/datatable_spec.js
+++ /dev/null
@@ -1,259 +0,0 @@
-describe('DataTable', function () {
-    it('instance is created without any errors', () => {
-        cy.visit('/');
-
-        cy.window()
-            .its('DataTable')
-            .then(DataTable => {
-                // eslint-disable-next-line
-                new DataTable('#datatable2', {
-                    columns: ['Name', 'Position'],
-                    data: [
-                        ['Faris', 'Developer']
-                    ]
-                });
-            });
-
-        cy.get('#datatable2 .datatable')
-            .contains('Faris');
-    });
-
-    describe('Cell', function () {
-        before(function () {
-            cy.visit('/');
-        });
-
-        it('focuses cell on click', function () {
-            cy.clickCell(2, 0)
-                .should('have.class', 'dt-cell--focus');
-        });
-
-        it('not focuses cell which are not focusable', function () {
-            cy.clickCell(1, 0)
-                .should('not.have.class', 'dt-cell--focus');
-        });
-
-        it('edit cell on enter press', function () {
-            cy.getCell(4, 0).type('{enter}')
-                .should('have.class', 'dt-cell--editing')
-                .type('{enter}')
-                .should('not.have.class', 'dt-cell--editing');
-        });
-
-        it('edit cell on double click', function () {
-            cy.getCell(4, 0)
-                .as('target')
-                .dblclick({ force: true })
-                .should('have.class', 'dt-cell--editing');
-
-            cy.clickCell(3, 0);
-
-            cy.get('@target').should('not.have.class', 'dt-cell--editing');
-        });
-
-        it('edit cell', function () {
-            cy.getCell(4, 1).dblclick();
-            cy.getCell(4, 1).find('input').click();
-            cy.focused().type('{selectall}{del}Test{enter}');
-            cy.getCell(4, 1).contains('Test');
-        });
-
-        it('if editing is false: editing should not activate', function () {
-            cy.getCell(3, 0).dblclick({ force: true })
-                .should('not.have.class', 'dt-cell--editing');
-        });
-
-        it('navigation using arrow keys', function () {
-            cy.clickCell(2, 0)
-                .type('{rightarrow}');
-
-            cy.get('.dt-cell--focus')
-                .should('have.class', 'dt-cell--3-0')
-                .click({ force: true })
-                .type('{downarrow}');
-
-            cy.get('.dt-cell--focus')
-                .should('have.class', 'dt-cell--3-1');
-            // TODO: test navigation over hidden rows
-        });
-
-        it('navigation using ctrl + arrow keys', function () {
-            cy.clickCell(2, 0)
-                .type('{ctrl}{rightarrow}');
-            cy.get('.dt-cell--focus')
-                .should('have.class', 'dt-cell--7-0');
-        });
-
-        it('cell selection using shift + arrow keys', function () {
-            cy.getCell(2, 1)
-                .type('{shift}{rightarrow}{rightarrow}{downarrow}');
-
-            // 6 cells and 2 headers
-            cy.get('.dt-cell--highlight').should('have.length', 6 + 2);
-
-            cy.clickCell(2, 0);
-        });
-
-        it('mouse selection', function () {
-            // TODO:
-            // cy.getCell(2, 1)
-            //     .trigger('mousedown', { which: 1, pageX: 331, pageY: 207, force: true })
-            //     .trigger('mousemove', { which: 1, pageX: 489, pageY: 312 })
-            //     .trigger('mouseup');
-        });
-    });
-
-    describe('Column', function () {
-        before(function () {
-            cy.visit('/');
-        });
-
-        it('header dropdown toggles on click', function () {
-            cy.getColumnCell(2)
-                .find('.dt-dropdown__toggle')
-                .as('toggle')
-                .click();
-            cy.get('.dt-dropdown__list')
-                .as('dropdown-list')
-                .should('be.visible');
-
-            cy.getColumnCell(2).click();
-
-            cy.get('@dropdown-list').should('not.be.visible');
-        });
-
-        it('sort ascending button should work', function () {
-            cy.clickDropdown(2);
-            cy.clickDropdownItem(2, 'Sort Ascending');
-
-            cy.window().then(win => win.datatable.getColumn(2))
-                .its('sortOrder')
-                .should('eq', 'asc');
-
-            cy.window().then(win => win.datatable.datamanager)
-                .its('currentSort.colIndex')
-                .should('eq', 2);
-
-            cy.get('.dt-scrollable .dt-row:first')
-                .contains('Airi Satou');
-
-            cy.clickDropdownItem(2, 'Reset sorting');
-        });
-
-        it('removes column using dropdown action', function () {
-            cy.get('.dt-cell--header').should('have.length', 8);
-
-            cy.clickDropdown(5);
-            cy.clickDropdownItem(5, 'Remove column');
-
-            cy.get('.dt-cell--header').should('have.length', 7);
-        });
-    });
-
-    describe('Row', function () {
-        before(function () {
-            cy.visit('/');
-        });
-
-        it('check / uncheck row', function () {
-            cy.get('.dt-scrollable .dt-row:first')
-                .find('input[type="checkbox"]')
-                .click();
-
-            cy.get('[data-row-index="0"]').should('have.class', 'dt-row--highlight');
-
-            cy.get('.dt-toast').contains('1 row selected');
-        });
-    });
-
-    describe('Inline Filters', function () {
-        before(function () {
-            cy.visit('/');
-        });
-
-        beforeEach(function () {
-            cy.get('.dt-filter[data-col-index=4]').as('filterInput4');
-            cy.get('.dt-filter[data-col-index=5]').as('filterInput5');
-            cy.get('.dt-filter[data-col-index=6]').as('filterInput6');
-        });
-
-        afterEach(function () {
-            cy.get('@filterInput4').clear();
-            cy.get('@filterInput5').clear();
-            cy.get('@filterInput6').clear();
-            cy.get('.dt-row[data-row-index=0]').should('be.visible');
-        });
-
-        it('simple text filter', function () {
-            cy.getCell(4, 0).click().type('{ctrl}f');
-
-            cy.get('@filterInput4').type('edin');
-            cy.get('.dt-row[data-row-index=0]').should('be.visible');
-            cy.get('.dt-row[data-row-index=1]').should('not.be.visible');
-        });
-
-        it('simple number filter', function () {
-            cy.get('@filterInput5').type('15');
-            cy.get('.dt-row[data-row-index=2]').should('be.visible');
-            cy.get('.dt-row[data-row-index=15]').should('be.visible');
-            cy.get('.dt-row[data-row-index=22]').should('not.be.visible');
-        });
-
-        it('greater than', function () {
-            cy.get('@filterInput5').type('> 6000');
-            cy.get('.dt-row[data-row-index=0]').should('not.be.visible');
-            cy.get('.dt-row[data-row-index=3]').should('be.visible');
-        });
-
-        it('less than', function () {
-            cy.get('@filterInput5').type('< 2000');
-            cy.get('.dt-row[data-row-index=0]').should('not.be.visible');
-            cy.get('.dt-row[data-row-index=51]').should('be.visible');
-        });
-
-        it('range', function () {
-            cy.get('@filterInput5').type(' 2000: 5000');
-            cy.get('.dt-row[data-row-index=4]').should('not.be.visible');
-            cy.get('.dt-row[data-row-index=5]').should('be.visible');
-        });
-
-        it('equals', function () {
-            cy.get('@filterInput5').type('=9608');
-            cy.get('.dt-row-6').should('be.visible');
-        });
-
-        it('multiple filters', function () {
-            cy.get('@filterInput4').type('to');
-            cy.get('@filterInput5').type('54');
-
-            cy.get('.dt-row[data-row-index=0]').should('be.visible');
-            cy.get('.dt-row[data-row-index=4]').should('be.visible');
-            cy.get('.dt-row[data-row-index=1]').should('not.be.visible');
-        });
-
-        it('greater than for string type filters', function () {
-            cy.get('@filterInput6').type('> 01/07/2011');
-            cy.wait(500);
-            cy.get('.dt-row[data-row-index=0]').should('not.be.visible');
-            cy.get('.dt-row[data-row-index=1]').should('be.visible');
-            cy.get('.dt-row[data-row-index=3]').should('be.visible');
-            cy.get('.dt-row[data-row-index=5]').should('be.visible');
-        });
-    });
-
-    describe('Inline filters with sorting', function () {
-        before(function () {
-            cy.visit('/');
-        });
-
-        it('filters with sorting', function () {
-            cy.clickDropdown(7);
-            cy.clickDropdownItem(7, 'Sort Descending');
-            cy.get('.dt-filter[data-col-index=5]').as('filterInput5');
-            cy.getCell(5, 24).click().type('{ctrl}f');
-            cy.get('@filterInput5').type('>3000');
-
-            cy.get('.dt-scrollable .dt-row').first().should('have.class', 'dt-row-24');
-        });
-    });
-});
diff --git a/cypress/integration/inline_filters.js b/cypress/integration/inline_filters.js
new file mode 100644
index 0000000..c4858eb
--- /dev/null
+++ b/cypress/integration/inline_filters.js
@@ -0,0 +1,90 @@
+describe('Inline Filters', function () {
+    before(function () {
+        cy.visit('/');
+    });
+
+    beforeEach(function () {
+        cy.get('.dt-filter[data-col-index=4]').as('filterInput4');
+        cy.get('.dt-filter[data-col-index=5]').as('filterInput5');
+        cy.get('.dt-filter[data-col-index=6]').as('filterInput6');
+        cy.get('.dt-row[data-row-index=0]').should('be.visible');
+    });
+
+    it('simple text filter', function () {
+        cy.getCell(4, 0).click().type('{ctrl}f');
+
+        cy.get('@filterInput4').type('edin');
+        cy.get('.dt-row[data-row-index=0]').should('be.visible');
+        cy.get('.dt-row[data-row-index=1]').should('not.be.visible');
+        cy.get('@filterInput4').clear();
+    });
+
+    it('simple number filter', function () {
+        cy.get('@filterInput5').type('15');
+        cy.get('.dt-row[data-row-index=2]').should('be.visible');
+        cy.get('.dt-row[data-row-index=15]').should('be.visible');
+        cy.get('.dt-row[data-row-index=22]').should('not.be.visible');
+        cy.get('@filterInput5').clear();
+    });
+
+    it('greater than', function () {
+        cy.get('@filterInput5').type('> 6000');
+        cy.get('.dt-row[data-row-index=0]').should('not.be.visible');
+        cy.get('.dt-row[data-row-index=3]').should('be.visible');
+        cy.get('@filterInput5').clear();
+    });
+
+    it('less than', function () {
+        cy.get('@filterInput5').type('< 2000');
+        cy.get('.dt-row[data-row-index=0]').should('not.be.visible');
+        cy.get('.dt-row[data-row-index=51]').should('be.visible');
+        cy.get('@filterInput5').clear();
+    });
+
+    it('range', function () {
+        cy.get('@filterInput5').type(' 2000: 5000');
+        cy.get('.dt-row[data-row-index=4]').should('not.be.visible');
+        cy.get('.dt-row[data-row-index=5]').should('be.visible');
+        cy.get('@filterInput5').clear();
+    });
+
+    it('equals', function () {
+        cy.get('@filterInput5').type('=9608');
+        cy.get('.dt-row-6').should('be.visible');
+        cy.get('@filterInput5').clear();
+    });
+
+    it('multiple filters', function () {
+        cy.get('@filterInput4').type('to');
+        cy.get('@filterInput5').type('54');
+
+        cy.get('.dt-row[data-row-index=0]').should('be.visible');
+        cy.get('.dt-row[data-row-index=4]').should('be.visible');
+        cy.get('.dt-row[data-row-index=1]').should('not.be.visible');
+        cy.get('@filterInput4').clear();
+        cy.get('@filterInput5').clear();
+    });
+
+    it('greater than for string type filters', function () {
+        cy.get('@filterInput6').type('> 01/07/2011');
+        cy.get('.dt-row[data-row-index=0]').should('not.be.visible');
+        cy.get('.dt-row[data-row-index=1]').should('be.visible');
+        cy.get('.dt-row[data-row-index=3]').should('be.visible');
+        cy.get('.dt-row[data-row-index=5]').should('be.visible');
+        cy.get('@filterInput6').clear();
+    });
+
+    it('filters with sorting', function () {
+        cy.visit('/');
+        cy.clickDropdown(7);
+        cy.clickDropdownItem(7, 'Sort Descending');
+        cy.get('.dt-filter[data-col-index=5]').as('filterInput5');
+        cy.getCell(5, 24).click().type('{ctrl}f');
+        cy.get('@filterInput5').type('>3000', {delay: 100});
+
+        cy.get('.dt-scrollable .dt-row:first')
+            .should('contain', 'Angelica')
+            .should('have.class', 'dt-row-24');
+        cy.get('@filterInput5').clear();
+    });
+});
diff --git a/cypress/integration/new_instance.js b/cypress/integration/new_instance.js
new file mode 100644
index 0000000..e2ebf4e
--- /dev/null
+++ b/cypress/integration/new_instance.js
@@ -0,0 +1,20 @@
+describe('DataTable init', function () {
+    it('instance is created without any errors', () => {
+        cy.visit('/');
+
+        cy.window()
+            .its('DataTable')
+            .then(DataTable => {
+                // eslint-disable-next-line
+                new DataTable('#datatable2', {
+                    columns: ['Name', 'Position'],
+                    data: [
+                        ['Faris', 'Developer']
+                    ]
+                });
+            });
+
+        cy.get('#datatable2 .datatable')
+            .contains('Faris');
+    });
+});
diff --git a/cypress/integration/row.js b/cypress/integration/row.js
new file mode 100644
index 0000000..1278e79
--- /dev/null
+++ b/cypress/integration/row.js
@@ -0,0 +1,15 @@
+describe('Row', function () {
+    before(function () {
+        cy.visit('/');
+    });
+
+    it('check / uncheck row', function () {
+        cy.get('.dt-scrollable .dt-row:first')
+            .find('input[type="checkbox"]')
+            .click();
+
+        cy.get('[data-row-index="0"]').should('have.class', 'dt-row--highlight');
+
+        cy.get('.dt-toast').contains('1 row selected');
+    });
+});