Fix some intermittent test failures due to Array order.