#2216
TestNG
Merge branch 'master' of github.com:molgenis/molgenis
Fixed unit test for das module after merge of data-api
Merge pull request #943 from bartcharbon/master

Fixed unit test for das module after merge of data-api
#2216
Merge branch 'master' of github.com:molgenis/molgenis
#2216
Merge pull request #944 from jjettenn/master

#2216
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
fix tests