Added tests for datasource handling drags

- refactorings