Interfaces to distinguish message types
Updated MessageTest