Updating test cases.
Adapting latest annotation changes.
Merge branch 'master' of https://github.com/COelsner/RTTAnnotationEditor