Fix #94
Update tests for sort-order