Merge "Move more network unit tests to common tests"