Added some tests
Slightly deeper message analysis