Fixed failing tests to do with ordering of results.