by including the XMPP entity which send the XMPP error reply to us. Also cleanup the no longer used constructors.
and resurrect a few integration tests.