Nailed down Sort Order sorting. Added test.