Minor nit cleanup in XClient

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>
Fix mirror tests (don't depend on tree's order, it may vary)

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>
Fix more tests that depend on ordering of unordered cmds

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>