Merge "Add tests for external network"