Mock message calls during tests

Use shut-up to mock calls to message during test cases, instead of
inspecting the *Messages* buffer.  This is more reliable, and does not
involve global side-effects.