Issue tigertext/xmpp#1388: Improving Coverage