Fix unit tests that are failing due to order of results from server. also enhance test to clearly show secondary sort