cleanup
rename test method
add nn_tcp tests