Replaced old mock_xmpp