refactaring
Update message
add getClassName
Update InstanceMatcher
refactaring