Change a couple of messages and fix affected test.