Reapply missing testsuite changes for arm
8 files changed