added tests, ClassMentionX, etc.