Merge "Fix network sorting in API tests"