Merge "Make test 100 not depend on undefined ordering."