Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
Test fix
Fix Tests
Merge pull request #941 from dennishendriksen/feature/studydefinitionservice

Fix tests due to data API changes