fix test
Fix annotator tests, refactor classes to make testable
Merge pull request #1322 from dennishendriksen/master

Fix annotator tests, refactor classes to make testable
fix attribute selection issue
Merge pull request #1323 from dennishendriksen/master

fix attribute selection issue
Merge branch 'master' of https://github.com/molgenis/molgenis