Adding network_config_test.go + some changes