ARM test suite fixes
Merge pull request #3093 from jpf91/arm-1

ARM test suite fixes