Adding tests and coverage for messages