Tweak message handler so simple test works