diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index bb2a7b9f07..6618bfd7ca 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -105,7 +105,8 @@ class Portal(object):
         sys.path.append('.')
 
         # create a store of services
-        self.services = service.IServiceCollection(application)
+        self.services = service.MultiService()
+        self.services.setServiceParent(application)
         self.amp_protocol = None  # set by amp factory
         self.sessions = PORTAL_SESSIONS
         self.sessions.portal = self
diff --git a/evennia/server/tests/test_amp_client.py b/evennia/server/tests/test_amp_client.py
new file mode 100644
index 0000000000..45578eba01
--- /dev/null
+++ b/evennia/server/tests/test_amp_client.py
@@ -0,0 +1,94 @@
+"""
+Test AMP client
+
+"""
+
+import pickle
+from unittest import TestCase
+from mock import MagicMock, patch
+from evennia.server import amp_client
+from evennia.server.portal import amp_server
+from evennia.server.portal import amp
+from evennia.server import server
+from evennia.server.portal import portal
+from evennia.server import serversession, session
+from evennia.utils import create
+
+
+class _TestAMP(TestCase):
+
+    def setUp(self):
+        with patch("evennia.server.initial_setup.get_god_account") as mockgod:
+            self.account = create.account("TestAMPAccount", "test@test.com", "testpassword")
+            mockgod.return_value = self.account
+            self.server = server.Evennia(MagicMock())
+            self.server.sessions.data_in = MagicMock()
+            self.server.sessions.data_out = MagicMock()
+            self.amp_client_factory = amp_client.AMPClientFactory(self.server)
+            self.amp_client = self.amp_client_factory.buildProtocol("127.0.0.1")
+            self.session = serversession.ServerSession()
+            self.session.sessid = 1
+
+            self.portal = portal.Portal(MagicMock())
+            self.portalsession = session.Session()
+            self.portalsession.sessid = 1
+            self.portal.sessions[1] = self.portalsession
+            self.portal.sessions.data_in = MagicMock()
+            self.portal.sessions.data_out = MagicMock()
+            self.amp_server_factory = amp_server.AMPServerFactory(self.portal)
+            self.amp_server = self.amp_server_factory.buildProtocol("127.0.0.1")
+
+    def tearDown(self):
+        self.account.delete()
+
+    def _connect_client(self, mocktransport):
+        "Setup client to send data for testing"
+        mocktransport.write = MagicMock()
+        self.amp_client.makeConnection(mocktransport)
+        mocktransport.write.reset_mock()
+
+    def _connect_server(self, mocktransport):
+        "Setup server to send data for testing"
+        mocktransport.write = MagicMock()
+        self.amp_server.makeConnection(mocktransport)
+        mocktransport.write.reset_mock()
+
+    def _catch_wire_read(self, mocktransport):
+        "Parse what was supposed to be sent over the wire"
+        arg_list = mocktransport.write.call_args_list
+
+        all_sent = []
+        for i, cll in enumerate(arg_list):
+            args, kwargs = cll
+            raw_inp = args[0]
+            all_sent.append(raw_inp)
+
+        return all_sent
+
+
+@patch("evennia.server.server.LoopingCall", MagicMock())
+@patch("evennia.server.portal.amp.amp.BinaryBoxProtocol.transport")
+class TestAMPClientSend(_TestAMP):
+    """Test amp client sending data"""
+
+    def test_msg2portal(self, mocktransport):
+        self._connect_client(mocktransport)
+        self.amp_client.send_MsgServer2Portal(self.session, text={"foo": "bar"})
+        wire_data = self._catch_wire_read(mocktransport)[0]
+
+        self._connect_server(mocktransport)
+        self.amp_server.dataReceived(wire_data)
+        self.portal.sessions.data_out.assert_called_with(self.portalsession, text={"foo": "bar"})
+
+    def test_adminserver2portal(self, mocktransport):
+        self._connect_client(mocktransport)
+
+        self.amp_client.send_AdminServer2Portal(self.session,
+                                                operation=amp.PSYNC,
+                                                info_dict={}, spid=None)
+        wire_data = self._catch_wire_read(mocktransport)[0]
+
+        self._connect_server(mocktransport)
+        self.amp_server.data_in = MagicMock()
+        self.amp_server.dataReceived(wire_data)
+        self.amp_server.data_in.assert_called()