test_xmpp_bcast failure fixes