ARM: yet another round of ARM test clean ups