MockSender improvements