Update tests to deal with potential ordering differences.