fixed broken unit tests
Merge pull request #556 from shatterednirvana/xmpp-stability-fix

fixed broken unit tests