Fix JSON output for the extras api
Adjust unit-tests to the new data returned by the extras API
Adjust unit-tests now that the search functions order the results