Some changes in src/network_test/*