More changes to sort test