Fixing test failures (the sort order has to always be specified to satisfy 3.4.x servers).