Added tests for sort order
Got most of the tests we want added. Still need to tune relevance testing in int and prod.