Fix network test and put connect and disconnect to private which are replaced by addEndpoint and removeEndpoint
Merge branch 'wsun'