Fix tests that failed due to LiftSorter.SortLiftFile()

Fix test failures with another cherry-pick.