Tweak tests to fix messages