Updated the mocks to give better handling of message post mocking.