Removed some methods from message model
Lots of tests added. Coverage is almost 100%