Arm test

Fix #6353 and better support for ARM Test