Merge "Message: Clean up unit tests and improve code coverage"