diff --git a/t/config/relayclients b/t/config/relayclients
index 13c9be7..31fcaeb 100644
--- a/t/config/relayclients
+++ b/t/config/relayclients
@@ -1,5 +1,14 @@
-# Format is IP, or IP part with trailing dot
+# used by plugins/relay
+# IPv4 format is IP, or IP part with trailing dot
 # e.g. "127.0.0.1", or "192.168."
 127.0.0.1 
 # leading/trailing whitespace is ignored
  192.0. 
+#
+# IPv6 formats can be compressed or expanded, may include a prefixlen,
+# and can end on any nibble boundary. Nibble boundaries must be expressed
+# in expanded format.  (RFC 3849 example)
+2001:0DB8
+2001:DB8::1
+2001:DB8::1/32
+2001:0DB8:0000:0000:0000:0000:0000:0001
diff --git a/t/plugin_tests/dspam b/t/plugin_tests/dspam
index 4752ec8..8e0645c 100644
--- a/t/plugin_tests/dspam
+++ b/t/plugin_tests/dspam
@@ -22,6 +22,7 @@ sub test_log_and_return {
     my $transaction = $self->qp->transaction;
 
     # reject not set
+    $self->{_args}{reject} = undef;
     $transaction->notes('dspam', { class=> 'Spam', probability => .99, confidence=>1 } );
     ($r) = $self->log_and_return( $transaction );
     cmp_ok( $r, '==', DECLINED, "($r)");
diff --git a/t/plugin_tests/check_earlytalker b/t/plugin_tests/earlytalker
similarity index 100%
rename from t/plugin_tests/check_earlytalker
rename to t/plugin_tests/earlytalker
diff --git a/t/plugin_tests/headers b/t/plugin_tests/headers
index 3470164..7cf9e7e 100644
--- a/t/plugin_tests/headers
+++ b/t/plugin_tests/headers
@@ -86,6 +86,7 @@ sub test_hook_data_post {
     my $transaction = $self->qp->transaction;
 
     my ($code, $mess) = $self->hook_data_post( $transaction );
+    $mess ||= '';  # avoid undef warning
     cmp_ok( DECLINED, '==', $code, "okay $code, $mess" );
 
     $transaction->header->delete('Date');