Removing smack bits from the xmpp component and fixing tests.