Add tests and messages.