disable test good hosts
remove tcp and udp tests
Merge branches 'try2' and 'try3'
remove icmp