Small change in message class
Try to fix branched paths
Merge with test class
Fixes to remove any unwanted changes that occured during divergation