--- discoverers/nrg-discover-tcp.in.org	2006-01-23 21:21:14.000000000 -0800
+++ discoverers/nrg-discover-tcp.in	2006-01-23 21:24:25.000000000 -0800
@@ -5,12 +5,12 @@
 
 @all_modes = qw(ftp http imap pop smtp ssh);
 %tests = ( 
-  ftp   => "21 220 \"USER anonymous\" 331",
-  http  => "80 \"\" \"GET / HTTP/1.0\\n\" HTTP",
+  ftp   => "21 220",
+  http  => "80 \"\" \"GET / HTTP/1.1\\n\" HTTP",
   imap  => "143 \"\\* OK\" \"CMD NOOP\" \"CMD OK\"",
-  pop   => "110 \"\\+OK\" \"USER nrg\" \"\\+OK\"",
-  smtp  => "25 220 \"HELO nrg\" 250",
-  ssh   => "22 SSH NRG_PROBE \"Protocol mismatch\""
+  pop   => "110 \"\\+OK\"",
+  smtp  => "25 220",
+  ssh   => "22 SSH"
 );
 
 $html_print_template = '@prefix@/templates/discover-tcp.tm';