Testsuite fixes on x32