Merge "Refactor tests to use create_network convenience params."