Merge "Refactor of test_network_basic_ops -prep new tests"