Fixing up ports in tests.
Merge branch 'master' of https://github.com/Kixeye/kixmpp.git