Fix all cases
Add tests
Adapt the Wire
Fix XMPP links