Updated the message and tests.