network: Refactored. Test case updated