diff --git a/tests/data/test825 b/tests/data/test825
index 82b86d9e07421e05bfa30ebea723a9d8082d42a7..e9437ce5ed50e9e565c3eb3cd88887df2412a802 100644
--- a/tests/data/test825
+++ b/tests/data/test825
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH PLAIN SASL-IR
+IMAP AUTH PLAIN
+SASL-IR
 RFC4616
 </keywords>
 </info>
diff --git a/tests/data/test826 b/tests/data/test826
index fb829e5298cc8e265708dc4bcba7ad8e93437845..44893a33adc67bf5a4f5e751c2955b165eaabcc6 100644
--- a/tests/data/test826
+++ b/tests/data/test826
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH LOGIN SASL-IR
+IMAP AUTH LOGIN
+SASL-IR
 </keywords>
 </info>
 
diff --git a/tests/data/test827 b/tests/data/test827
index 00fba3c64757412ddbdf59970eaee1dbcf0119f9..5efe0d02fa627d63d6c2ea72e5f73c0da027237d 100644
--- a/tests/data/test827
+++ b/tests/data/test827
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM SASL-IR
+IMAP AUTH NTLM
+SASL-IR
 </keywords>
 </info>
 
diff --git a/tests/data/test828 b/tests/data/test828
index 03f3bd5fb9bcee0bb8ec196393f6758d4c707424..380078a7322d5fbaf34b3f32613a3ab4508a7c43 100644
--- a/tests/data/test828
+++ b/tests/data/test828
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH OAUTH2 SASL-IR
+IMAP AUTH OAUTH2
+SASL-IR
 RFC6749
 </keywords>
 </info>
diff --git a/tests/data/test830 b/tests/data/test830
index 42bfffff5de4aa14d1966436f1cdfcb95410b485..c7938b51786ceb3ba235752889871a72e70eed28 100644
--- a/tests/data/test830
+++ b/tests/data/test830
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH CRAM-MD5 SASL CANCELLATION
+IMAP AUTH CRAM-MD5
+SASL CANCELLATION
 RFC2195
 </keywords>
 </info>
diff --git a/tests/data/test831 b/tests/data/test831
index 72aee1274a5fb06ba273ac8928fece27f8f2662b..8f0762023af8cbfa25571a418986d94ed663412d 100644
--- a/tests/data/test831
+++ b/tests/data/test831
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM SASL CANCELLATION
+IMAP AUTH NTLM
+SASL CANCELLATION
 </keywords>
 </info>
 
diff --git a/tests/data/test832 b/tests/data/test832
index 1453001a4c7772874d2384e17ec59fe85820e656..13cf56fa3c4d4af6c1e62f9d99ca39cd8ec9e3d0 100644
--- a/tests/data/test832
+++ b/tests/data/test832
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH DIGEST-MD5 SASL CANCELLATION
+IMAP AUTH DIGEST-MD5
+SASL CANCELLATION
 RFC2831
 </keywords>
 </info>
diff --git a/tests/data/test833 b/tests/data/test833
index b5210c330b7611ad0d4ebe7bda7d16e31aae40a4..e2fe15ea1944f6b2b0ecc529de2f5e86b95994a9 100644
--- a/tests/data/test833
+++ b/tests/data/test833
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH CRAM-MD5 SASL DOWNGRADE
+IMAP AUTH CRAM-MD5
+IMAP AUTH PLAIN
+SASL DOWNGRADE
 RFC2195
 </keywords>
 </info>
diff --git a/tests/data/test834 b/tests/data/test834
index 71dcc0b929f73aa290a8b5175b2e4adf65767446..6e8d5ef6930c57605c7ce6e52761a9aa01c1b522 100644
--- a/tests/data/test834
+++ b/tests/data/test834
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM SASL DOWNGRADE
+IMAP AUTH NTLM
+IMAP AUTH PLAIN
+SASL DOWNGRADE
 </keywords>
 </info>
 
diff --git a/tests/data/test835 b/tests/data/test835
index c0a1283f63658d9dc838f4fd2714660a72ffeef5..89158021e73fed6d41421476ae7ac5feff8d76b5 100644
--- a/tests/data/test835
+++ b/tests/data/test835
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH DIGEST-MD5 SASL DOWNGRADE
+IMAP AUTH DIGEST-MD5
+IMAP AUTH PLAIN
+SASL DOWNGRADE
 RFC2831
 </keywords>
 </info>
diff --git a/tests/data/test871 b/tests/data/test871
index c24279f87b7d740fad85b88a8e52ecb2c4f45d9d..cd4fcf95466f9214938bbcf12ad8d1f4889cb2f7 100644
--- a/tests/data/test871
+++ b/tests/data/test871
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH PLAIN SASL-IR
+POP3 AUTH PLAIN
+SASL-IR
 RFC1734
 RFC4616
 RFC5034
diff --git a/tests/data/test872 b/tests/data/test872
index 12a0d791af1b2687dbd13539b7a394a1196c99e2..9ef3a934c466d3ee6db6e18baa13ffb26ac7b7e6 100644
--- a/tests/data/test872
+++ b/tests/data/test872
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH LOGIN SASL-IR 
+POP3 AUTH LOGIN
+SASL-IR
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test873 b/tests/data/test873
index d85fc29cecbafb3d1b973d895f15709c5664feed..2e51e366627deba61036764e15284cf985e6a5ad 100644
--- a/tests/data/test873
+++ b/tests/data/test873
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM SASL-IR
+POP3 AUTH NTLM
+SASL-IR
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test874 b/tests/data/test874
index 107b898eb07294663020e020ad1696c9bb58d050..93a0df6b4e07df455d6b974119893696faaa2a9c 100644
--- a/tests/data/test874
+++ b/tests/data/test874
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH OAUTH2 SASL-IR
+POP3 AUTH OAUTH2
+SASL-IR
 RFC1734
 RFC5034
 RFC6749
diff --git a/tests/data/test876 b/tests/data/test876
index df577810f6a282ca3c8a211e664052e8c65a8e92..a2623c3f470a96b8671acdd77188f2ff23895b7b 100644
--- a/tests/data/test876
+++ b/tests/data/test876
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH CRAM-MD5 SASL CANCELLATION
+POP3 AUTH CRAM-MD5
+SASL CANCELLATION
 RFC1734
 RFC2195
 RFC5034
diff --git a/tests/data/test877 b/tests/data/test877
index cd20b6fd70cd880eef39c87df62acb81b252c7dc..4f3d811693dbe1c7a836ee276975bc0098b89b0a 100644
--- a/tests/data/test877
+++ b/tests/data/test877
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM SASL CANCELLATION
+POP3 AUTH NTLM
+SASL CANCELLATION
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test878 b/tests/data/test878
index 38e084776216f4c48c34d0eac7afb8afb9b8ba28..1b25b4787e73185883f4e6cfe6de1ed8a2c558d5 100644
--- a/tests/data/test878
+++ b/tests/data/test878
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH DIGEST-MD5 SASL CANCELLATION
+POP3 AUTH DIGEST-MD5
+SASL CANCELLATION
 RFC1734
 RFC2831
 RFC5034
diff --git a/tests/data/test879 b/tests/data/test879
index 7d88fbce0ad2755e6bbd0a2c81838238e4619ade..4b267de2cf42f7069a6fbb87aa275484a6548b2d 100644
--- a/tests/data/test879
+++ b/tests/data/test879
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH CRAM-MD5 SASL DOWNGRADE
+POP3 AUTH CRAM-MD5
+POP3 AUTH PLAIN
+SASL DOWNGRADE
 RFC1734
 RFC2195
 RFC5034
diff --git a/tests/data/test880 b/tests/data/test880
index 27036465fb51da4e547528ad0680e9f6866cc11e..fce0d35b00ce426d21e83532a99956b331b9a877 100644
--- a/tests/data/test880
+++ b/tests/data/test880
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM SASL DOWNGRADE
+POP3 AUTH NTLM
+POP3 AUTH PLAIN
+SASL DOWNGRADE
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test881 b/tests/data/test881
index 0f74bb4862ffc8f101c97288f6ea57660e51163d..c2200f7c96a2c1faf7dbace8aea75abd244e113c 100644
--- a/tests/data/test881
+++ b/tests/data/test881
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH DIGEST-MD5 SASL DOWNGRADE
+POP3 AUTH DIGEST-MD5
+POP3 AUTH PLAIN
+SASL DOWNGRADE
 RFC1734
 RFC2831
 RFC5034
diff --git a/tests/data/test919 b/tests/data/test919
index 22508ab28db5f6797a489e519fbf224c8d335789..6cfd62e45dd54f61d6c1beb7e7be85df3162c1b6 100644
--- a/tests/data/test919
+++ b/tests/data/test919
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH PLAIN SASL-IR
+SMTP AUTH PLAIN
+SASL-IR
 RFC4616
 RFC4954
 </keywords>
diff --git a/tests/data/test920 b/tests/data/test920
index 74f05a9cc28247ed4900dea1ff1e3a0c12fd7540..0fc10ede6f7580568cd607a60acee53d12f115db 100644
--- a/tests/data/test920
+++ b/tests/data/test920
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH LOGIN SASL-IR
+SMTP AUTH LOGIN
+SASL-IR
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test921 b/tests/data/test921
index 73f64a1506be759e471402c5088c55a5c71889cb..6e9ca8ab84aef4ab6b581a5903486ab6be75d26c 100644
--- a/tests/data/test921
+++ b/tests/data/test921
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM SASL-IR
+SMTP AUTH NTLM
+SASL-IR
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test922 b/tests/data/test922
index 0487cff4a73c967d97dab946ff10de1b9042d142..1f37496a2b167f4e9973584172025619c112fd7e 100644
--- a/tests/data/test922
+++ b/tests/data/test922
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH OAUTH2 SASL-IR
+SMTP AUTH OAUTH2
+SASL-IR
 RFC4954
 RFC6749
 </keywords>
diff --git a/tests/data/test932 b/tests/data/test932
index 398e4af0709ca5caf4727460135be3dbf70527ed..a103b181afaa28d1ef99a2a182aa0614e7f086f7 100644
--- a/tests/data/test932
+++ b/tests/data/test932
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH CRAM-MD5 SASL CANCELLATION
+SMTP AUTH CRAM-MD5
+SASL CANCELLATION
 RFC2195
 RFC4954
 </keywords>
diff --git a/tests/data/test933 b/tests/data/test933
index e52c8f90fb812a0c639f7cac590a228e2794e95c..0f6d4c042f156601e3c5c5c08fcd94d496177ed4 100644
--- a/tests/data/test933
+++ b/tests/data/test933
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM SASL CANCELLATION
+SMTP AUTH NTLM
+SASL CANCELLATION
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test934 b/tests/data/test934
index a1e16cfeb6a54301f98d1f5926d5e56b99760a9a..8ddbd218e94f37d1bc38b0f1ce5e5ed3543c677a 100644
--- a/tests/data/test934
+++ b/tests/data/test934
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH DIGEST-MD5 SASL CANCELLATION
+SMTP AUTH DIGEST-MD5
+SASL CANCELLATION
 RFC2831
 RFC4954
 </keywords>
diff --git a/tests/data/test935 b/tests/data/test935
index 2f5a688a54ff6077f8703f5b132d8e2080b70fa6..ec0047c255fae80c2666225a2f3dadfdd52878ee 100644
--- a/tests/data/test935
+++ b/tests/data/test935
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH CRAM-MD5 SASL DOWNGRADE
+SMTP AUTH CRAM-MD5
+SMTP AUTH PLAIN
+SASL DOWNGRADE
 RFC2195
 RFC4954
 </keywords>
diff --git a/tests/data/test936 b/tests/data/test936
index cbc6fb96d2e38c31a6bfe5240bfb4d972862af5d..42b30b137ee62a0d71742319f207da83151e0748 100644
--- a/tests/data/test936
+++ b/tests/data/test936
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM SASL DOWNGRADE
+SMTP AUTH NTLM
+SMTP AUTH PLAIN
+SASL DOWNGRADE
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test937 b/tests/data/test937
index 2472ae39980120b1ec978c8d316d6afcc6f9c2ba..46dbc256393a3c6cb57fc03d09284dd0a5ca872b 100644
--- a/tests/data/test937
+++ b/tests/data/test937
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH DIGEST-MD5 SASL DOWNGRADE
+SMTP AUTH DIGEST-MD5
+SMTP AUTH PLAIN
+SASL DOWNGRADE
 RFC2831
 RFC4954
 </keywords>