Messages tests and some code coverage stuff