Improved tests with messages.