fixed failing tests after refactoring
Merge pull request #6 from massiveart/feature/data-grid

Develop