Merge "Networking unit tests: fix some flaky tests"