Merge "Add unit tests for network_client"