revert r251849; need to move tests to arch-specific folders