Fixed error in Test annotation
Merge pull request #244 from acz-icm/master

Fixed error in Test annotation
MatchableEntity extension and refactoring