Improve event message
Improve Unit Test messages