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