Fixing test!
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1064 from jjettenn/master

Fixing test