Fixing typo
Adding EL RI to using in tests
Improving equality to SimpleMessage
Improving code