Improved ordering test...