Improve messages with tests and code