Sort without API break
Update test fixtures to reflect sort and index

(It was **really** a pain in the ass.)