Currently some tests related to custom functionality and Unified Archive are failing. As we work on solving issue #4524, we need to fix this tests to ensure that whole functionality works fine with changes done to deal with jid comparison issue.