diff --git a/tests/data/test856 b/tests/data/test856
index 55991c7b6b20f84d9f391fa6ee9b9f3a268db31b..ae089d19148d6385ca480f22c001954eb67dc4d0 100644
--- a/tests/data/test856
+++ b/tests/data/test856
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 POP3
-LOGIN
+LOGIN
 FAILURE
 </keywords>
 </info>
diff --git a/tests/data/test858 b/tests/data/test858
index 05477efb2dd23e5f02462c08dc3842982c11c6ed..0c7b3b7482d65690d56a3726439ede00f40ddfb1 100644
--- a/tests/data/test858
+++ b/tests/data/test858
@@ -3,7 +3,7 @@
 <keywords>
 POP3
 DELE
-CUSTOMREQUEST
+CUSTOMREQUEST
 </keywords>
 </info>
 
diff --git a/tests/data/test859 b/tests/data/test859
index f038b5c68a8348fe22a1067337d2eaa0989171f6..b85ba1f90125f3ed0624ed65495c2f32cd493ab1 100644
--- a/tests/data/test859
+++ b/tests/data/test859
@@ -3,7 +3,7 @@
 <keywords>
 POP3
 STAT
-CUSTOMREQUEST
+CUSTOMREQUEST
 </keywords>
 </info>
 
diff --git a/tests/data/test860 b/tests/data/test860
index fc8b252c94f67a16c82129c1d643c3374368781e..46a1b9a72771aa481fa79c13eafafc7f8a075230 100644
--- a/tests/data/test860
+++ b/tests/data/test860
@@ -3,7 +3,7 @@
 <keywords>
 POP3
 NOOP
-CUSTOMREQUEST
+CUSTOMREQUEST
 </keywords>
 </info>
 
diff --git a/tests/data/test861 b/tests/data/test861
index 0a69176154cb086b38130f2bdf6fbad648e4c764..ee86d82c262bc89fb90a2de9249757b9c1271d3b 100644
--- a/tests/data/test861
+++ b/tests/data/test861
@@ -3,7 +3,8 @@
 <keywords>
 POP3
 UIDL
-CUSTOMREQUEST
+CUSTOMREQUEST
+RFC2449
 </keywords>
 </info>
 
diff --git a/tests/data/test862 b/tests/data/test862
index debba4df7f4e397d897eb6f3d1caa5121eeb4063..140a064b5a626d9f0a17259f51e52697f13b47af 100644
--- a/tests/data/test862
+++ b/tests/data/test862
@@ -3,7 +3,8 @@
 <keywords>
 POP3
 TOP
-CUSTOMREQUEST
+CUSTOMREQUEST
+RFC2449
 </keywords>
 </info>
 
diff --git a/tests/data/test903 b/tests/data/test903
index 8c0e90fa98420a74f05a44413e267d83e81a7618..7c23661d4ba9dd2517f08bb22d176d9b986ddf32 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -14,7 +14,7 @@ RFC4954
 <servercmd>
 AUTH PLAIN
 REPLY AUTH 334 PLAIN supported
-REPLY dGVzdAB0ZXN0ADEyMzQ= 235 Authenticated
+REPLY dXNlcgB1c2VyAHNlY3JldA== 235 Authenticated
 </servercmd>
 </reply>
 
@@ -31,7 +31,7 @@ SMTP plain authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sende
 <protocol>
 EHLO 903
 AUTH PLAIN
-dGVzdAB0ZXN0ADEyMzQ=
+dXNlcgB1c2VyAHNlY3JldA==
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test904 b/tests/data/test904
index dd7f5338697cf35d610760b13a0d175035e470f2..2c90cea97db0126256ff7369fb1bccdf4f14acbb 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -12,9 +12,9 @@ RFC4954
 <reply>
 <servercmd>
 AUTH LOGIN
-REPLY AUTH 334 LOGIN supported
-REPLY dGVzdA== 334 UGFzc3dvcmQ6
-REPLY MTIzNA== 235 Authenticated
+REPLY AUTH 334 LOGIN supported
+REPLY dXNlcg== 334 UGFzc3dvcmQ6
+REPLY c2VjcmV0 235 Authenticated
 </servercmd>
 </reply>
 
@@ -31,7 +31,7 @@ SMTP login authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sende
 <protocol>
 EHLO 904
 AUTH LOGIN
-dGVzdA==
-MTIzNA==
+dXNlcg==
+c2VjcmV0
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test906 b/tests/data/test906
index 6cf6bedbf5bf72d999376637bcfa2896459dcae0..4b0f2a854856b5c7b19e95465d96efb363bd1d43 100644
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -3,6 +3,7 @@
 <keywords>
 SMTP
 SMTP AUTH NTLM
+RFC4954
 </keywords>
 </info>
 
diff --git a/tests/data/test919 b/tests/data/test919
index bc26fef55edd305d260b29311eb19799c88753a4..22508ab28db5f6797a489e519fbf224c8d335789 100644
--- a/tests/data/test919
+++ b/tests/data/test919
@@ -30,7 +30,7 @@ SMTP plain authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>
 
@@ -39,7 +39,7 @@ smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sende
 <verify>
 <protocol>
 EHLO 919
-AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
+AUTH PLAIN dXNlcgB1c2VyAHNlY3JldA==
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test920 b/tests/data/test920
index 8502215e25e322fc0f3b5eec81e0b24865cb1698..74f05a9cc28247ed4900dea1ff1e3a0c12fd7540 100644
--- a/tests/data/test920
+++ b/tests/data/test920
@@ -13,7 +13,7 @@ RFC4954
 <servercmd>
 AUTH LOGIN
 REPLY AUTH 334 UGFzc3dvcmQ6
-REPLY MTIzNA== 235 Authenticated
+REPLY c2VjcmV0 235 Authenticated
 </servercmd>
 </reply>
 
@@ -30,7 +30,7 @@ SMTP login authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>
 
@@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sende
 <verify>
 <protocol>
 EHLO 920
-AUTH LOGIN dGVzdA==
-MTIzNA==
+AUTH LOGIN dXNlcg==
+c2VjcmV0
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA