Add more unit tests around messaging.
Remove coffee test again.