Adjusted network tests with refactoring