Fix a few test regressions resulting from property sorting.