Merge "Sorting services list before asserting in test_get_service_list test"