Fix tests that assumed ordered output