Removed message type numbering
Added tests for categories