move armhf and s390x to testing