Arch: Fixed test suite - fixes #1442