Fixed a few tests, made SocketMock serialize and deserialize messages to match what will actually be used