[Matahari] [PATCH] tests: few tweaks, mainly around s390x/ppc64 support