fix default sort on 2.2+
fix tests (sorting was fixed while tiered-sort tests were written on another branch)
Merge pull request #862 from dimagi/default-sort

fix default sort on 2.2+