Merge "modifies the test to sort based on UUID"