Added additional messages to the test. Part of #2347.