Fix tests for until ordering works