Pull the message to check from the framework in case it changes in the future.
Fix the failing unit test that was hidden by this issue.