diff --git a/tests/data/test819 b/tests/data/test819
index 5d5481103741a34b869ea7d4f3fc9161fa15e2e0..d0aa47ba549f3be010b399e0d244c51edfeb2524 100644
--- a/tests/data/test819
+++ b/tests/data/test819
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH PLAIN
 SASL
+SASL AUTH PLAIN
 RFC4616
 </keywords>
 </info>
diff --git a/tests/data/test820 b/tests/data/test820
index 3f06029b7996ddf8f72a0e30a492714ebe2991e9..f638f1cb63355e87ab029b7571f6590740b15f2f 100644
--- a/tests/data/test820
+++ b/tests/data/test820
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH LOGIN
 SASL
+SASL AUTH LOGIN
 </keywords>
 </info>
 
diff --git a/tests/data/test821 b/tests/data/test821
index 55f10633b6aa4b9ecaabb5edd7a9f33965180f12..aee373b9a36dbe35b96d06f9f04ec7a80be816b7 100644
--- a/tests/data/test821
+++ b/tests/data/test821
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH CRAM-MD5
 SASL
+SASL AUTH CRAM-MD5
 RFC2195
 </keywords>
 </info>
diff --git a/tests/data/test822 b/tests/data/test822
index 7e420783e15036a5d249e60303b340640e4061ab..aef4fd5e4ede04624e4e3de02fb9b8fbf4e0ddec 100644
--- a/tests/data/test822
+++ b/tests/data/test822
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM
 SASL
+SASL AUTH NTLM
 </keywords>
 </info>
 
diff --git a/tests/data/test823 b/tests/data/test823
index d1deca22c67df20504035f909f78286257b0f94c..5e4d59356ebf110c82e3273353a7f777d0762e12 100644
--- a/tests/data/test823
+++ b/tests/data/test823
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH DIGEST-MD5
 SASL
+SASL AUTH DIGEST-MD5
 RFC2831
 </keywords>
 </info>
diff --git a/tests/data/test824 b/tests/data/test824
index 3b64d1f669cfd9814d8b4b6ebb7baaee1faf4ee6..242c1b4a37ae016c328990c45641b8ba6b07951d 100644
--- a/tests/data/test824
+++ b/tests/data/test824
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH OAUTH2
 SASL
+SASL AUTH OAUTH2
 RFC6749
 </keywords>
 </info>
diff --git a/tests/data/test825 b/tests/data/test825
index 5a31058c7fbf8ee7007308f4d2ba317a84824a1e..6532b3ace7ef53e12dbde7dc95944a567a605d50 100644
--- a/tests/data/test825
+++ b/tests/data/test825
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH PLAIN
 SASL
+SASL AUTH PLAIN
 SASL-IR
 RFC4616
 </keywords>
diff --git a/tests/data/test826 b/tests/data/test826
index 174b2d4c0fad77ec5f4ebfd66a92a1902d7c2d7d..0f9282945f2a3c84ff1d5865c12f4c205e4b735d 100644
--- a/tests/data/test826
+++ b/tests/data/test826
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH LOGIN
 SASL
+SASL AUTH LOGIN
 SASL-IR
 </keywords>
 </info>
diff --git a/tests/data/test827 b/tests/data/test827
index f1469779ac5c40a6e7a04d33362467b3dbc957ef..ed19fc67fd2d386ba3f3dbf7d74c55b17c70dd08 100644
--- a/tests/data/test827
+++ b/tests/data/test827
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM
 SASL
+SASL AUTH NTLM
 SASL-IR
 </keywords>
 </info>
diff --git a/tests/data/test828 b/tests/data/test828
index c4f05776fd4b5cab32435997d21e284797c499e3..b2fb693ffe4e696861c9631e777087b78407fb32 100644
--- a/tests/data/test828
+++ b/tests/data/test828
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH OAUTH2
 SASL
+SASL AUTH OAUTH2
 SASL-IR
 RFC6749
 </keywords>
diff --git a/tests/data/test830 b/tests/data/test830
index 3dd58e6bce54a09af7bc7622abe584eed904a3b7..5803bb11ed60d94fdc360161fdba164c53e89a40 100644
--- a/tests/data/test830
+++ b/tests/data/test830
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH CRAM-MD5
 SASL
+SASL AUTH CRAM-MD5
 SASL CANCELLATION
 RFC2195
 </keywords>
diff --git a/tests/data/test831 b/tests/data/test831
index 77471d9be326b17f5ccfefdd570fabdb194767b2..8bff7eac0ff863d670225067d3f0062af76d0156 100644
--- a/tests/data/test831
+++ b/tests/data/test831
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM
 SASL
+SASL AUTH NTLM
 SASL CANCELLATION
 </keywords>
 </info>
diff --git a/tests/data/test832 b/tests/data/test832
index 42ae9035dc7a9e78ec6eb9aa68a01a5eaffc311c..4873e3569b8beaacc249f51d8040ac80aba38e03 100644
--- a/tests/data/test832
+++ b/tests/data/test832
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH DIGEST-MD5
 SASL
+SASL AUTH DIGEST-MD5
 SASL CANCELLATION
 RFC2831
 </keywords>
diff --git a/tests/data/test833 b/tests/data/test833
index a18593b9ea3c44de20c93cda41b5e6452d0237d2..b5fa03f9e078c272fae8c1520a475dbecd76768c 100644
--- a/tests/data/test833
+++ b/tests/data/test833
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH CRAM-MD5
-IMAP AUTH PLAIN
 SASL
+SASL AUTH CRAM-MD5
+SASL AUTH PLAIN
 SASL DOWNGRADE
 RFC2195
 </keywords>
diff --git a/tests/data/test834 b/tests/data/test834
index 5a447412b2d1c789989292d078d86d47f2af90eb..17101ddfcf90ca995bce183daab4da717f564c14 100644
--- a/tests/data/test834
+++ b/tests/data/test834
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM
-IMAP AUTH PLAIN
 SASL
+SASL AUTH NTLM
+SASL AUTH PLAIN
 SASL DOWNGRADE
 </keywords>
 </info>
diff --git a/tests/data/test835 b/tests/data/test835
index e6d8107449f72dd74edfcf0904a816dc59cbe288..2379a3abb14a4e09f1e6c36f8b5ce0a6051d9b6f 100644
--- a/tests/data/test835
+++ b/tests/data/test835
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH DIGEST-MD5
-IMAP AUTH PLAIN
 SASL
+SASL AUTH DIGEST-MD5
+SASL AUTH PLAIN
 SASL DOWNGRADE
 RFC2831
 </keywords>
diff --git a/tests/data/test865 b/tests/data/test865
index 1aa73a5c7129640ea6222873c1258b2657e19355..6f66f82d7de9ac1aac0aa33a11ce021863b813aa 100644
--- a/tests/data/test865
+++ b/tests/data/test865
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH PLAIN
 SASL
+SASL AUTH PLAIN
 RFC1734
 RFC4616
 RFC5034
diff --git a/tests/data/test866 b/tests/data/test866
index cebb2389961880ab3e30774cbc0e6952d2336049..8fee23ab06d2230f9496ab95efd564f4923247fa 100644
--- a/tests/data/test866
+++ b/tests/data/test866
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH LOGIN
 SASL
+SASL AUTH LOGIN
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test867 b/tests/data/test867
index ab029917a1bb3ba8a1b3e567fb779eb42347360e..139b467dec70115373cadfbde3d6bde51df82103 100644
--- a/tests/data/test867
+++ b/tests/data/test867
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH CRAM-MD5
 SASL
+SASL AUTH CRAM-MD5
 RFC1734
 RFC2195
 RFC5034
diff --git a/tests/data/test868 b/tests/data/test868
index 515dfbecbe64cb4d58ffba7eb61ca14991f89474..861e5e6795072194b62d595d2bf8e58a782b38fb 100644
--- a/tests/data/test868
+++ b/tests/data/test868
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM
 SASL
+SASL AUTH NTLM
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test869 b/tests/data/test869
index 42fb9eaa1334f056b2a37adf76c83df3ddc749a2..8350373c06be7de2ee6fb80db2d907eed9ea6c5c 100644
--- a/tests/data/test869
+++ b/tests/data/test869
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH DIGEST-MD5
 SASL
+SASL AUTH DIGEST-MD5
 RFC1734
 RFC2831
 RFC5034
diff --git a/tests/data/test870 b/tests/data/test870
index 73e3cd67465b114648c16bbf8a3cddf89d2144fe..885b8c159216b3318020146b6bdd907767fb1aae 100644
--- a/tests/data/test870
+++ b/tests/data/test870
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH OAUTH2
 SASL
+SASL AUTH OAUTH2
 RFC1734
 RFC5034
 RFC6749
diff --git a/tests/data/test871 b/tests/data/test871
index 6b3d1daf8f96ff5ab056b8ddd80c6a1294fb28e5..f4f236041664c587217bb281006550ba2fec57d5 100644
--- a/tests/data/test871
+++ b/tests/data/test871
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH PLAIN
 SASL
+SASL AUTH PLAIN
 SASL-IR
 RFC1734
 RFC4616
diff --git a/tests/data/test872 b/tests/data/test872
index 08ee46057494b498fb3975d03beba22a20af430d..05cb2a206194fd00c89be16b3d6f8262ec3ddf25 100644
--- a/tests/data/test872
+++ b/tests/data/test872
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH LOGIN
 SASL
+SASL AUTH LOGIN
 SASL-IR
 RFC1734
 RFC5034
diff --git a/tests/data/test873 b/tests/data/test873
index 0302c982cda08ae32ca90e81f91351d67601dc4d..43f9eb87c28f620e0b2014e8768c28fc3b0d949d 100644
--- a/tests/data/test873
+++ b/tests/data/test873
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM
 SASL
+SASL AUTH NTLM
 SASL-IR
 RFC1734
 RFC5034
diff --git a/tests/data/test874 b/tests/data/test874
index 4371a2fe498c8981cd9e153f170d261bb07568f1..de221fa91bcaf260b90f48ec334a982b75485d01 100644
--- a/tests/data/test874
+++ b/tests/data/test874
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH OAUTH2
 SASL
+SASL AUTH OAUTH2
 SASL-IR
 RFC1734
 RFC5034
diff --git a/tests/data/test876 b/tests/data/test876
index 213fa775acddae9f2fa3b7c237b27a0ae859b494..6d30e538b742a89d5d7521cc60979f9166a1ddac 100644
--- a/tests/data/test876
+++ b/tests/data/test876
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH CRAM-MD5
 SASL
+SASL AUTH CRAM-MD5
 SASL CANCELLATION
 RFC1734
 RFC2195
diff --git a/tests/data/test877 b/tests/data/test877
index de40d32bd256957492086c3ff80d63737f079af5..c4775942ff7a9967ac21209015be5148a432d442 100644
--- a/tests/data/test877
+++ b/tests/data/test877
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM
 SASL
+SASL AUTH NTLM
 SASL CANCELLATION
 RFC1734
 RFC5034
diff --git a/tests/data/test878 b/tests/data/test878
index a5bc8c09038a0e25d9cda124ba9d07d25ba6d57a..9027b0b47f309ec4aee62dbf42043725c50db651 100644
--- a/tests/data/test878
+++ b/tests/data/test878
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH DIGEST-MD5
 SASL
+SASL AUTH DIGEST-MD5
 SASL CANCELLATION
 RFC1734
 RFC2831
diff --git a/tests/data/test879 b/tests/data/test879
index 70f7b157c5442c68a13aa6848fdd56a13aa541f4..681d779b2a4ddc74b0c3f30d69d54c8c16c9bcc5 100644
--- a/tests/data/test879
+++ b/tests/data/test879
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH CRAM-MD5
-POP3 AUTH PLAIN
 SASL
+SASL AUTH CRAM-MD5
+SASL AUTH PLAIN
 SASL DOWNGRADE
 RFC1734
 RFC2195
diff --git a/tests/data/test880 b/tests/data/test880
index 3a920fdcdc2872dc54ec7df8164f8850b7d28aa3..f5eb697314786df404b6b005be20454d9cbfc970 100644
--- a/tests/data/test880
+++ b/tests/data/test880
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM
-POP3 AUTH PLAIN
 SASL
+SASL AUTH NTLM
+SASL AUTH PLAIN
 SASL DOWNGRADE
 RFC1734
 RFC5034
diff --git a/tests/data/test881 b/tests/data/test881
index 3ce5564c264ca5dc0c66da9d10ff429d49ea4749..02ac8fbd87abdde3e40548a28bc5bb8a053c5d45 100644
--- a/tests/data/test881
+++ b/tests/data/test881
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH DIGEST-MD5
-POP3 AUTH PLAIN
 SASL
+SASL AUTH DIGEST-MD5
+SASL AUTH PLAIN
 SASL DOWNGRADE
 RFC1734
 RFC2831
diff --git a/tests/data/test903 b/tests/data/test903
index a06052d7d196be5c34518b0c3d52567fafc5ce0b..2baf5e69624dc884efe8eaeef904917fac68047a 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH PLAIN
 SASL
+SASL AUTH PLAIN
 RFC4616
 RFC4954
 </keywords>
diff --git a/tests/data/test904 b/tests/data/test904
index 0006897818b8fed472f393ec631ab7a1ca7e26da..dd3dad09b07e9c2774e278f0d8a8c3529950499d 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH LOGIN
 SASL
+SASL AUTH LOGIN
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test905 b/tests/data/test905
index 9e239267a07d2f861dfc8b4df85d67de9ee80ece..565b0413698d0d2343eb03f2a24bc86fc2814de6 100644
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH CRAM-MD5
 SASL
+SASL AUTH CRAM-MD5
 RFC2195
 RFC4954
 </keywords>
diff --git a/tests/data/test906 b/tests/data/test906
index 81dd3770e9020aa69a7b1fa1a15361a550244ef2..01f0dd2072b572d45d5681591546cb7e216d78fa 100644
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM
 SASL
+SASL AUTH NTLM
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test907 b/tests/data/test907
index 9f785326c3edc13def9a3ebb4ab092681dec4199..16a4338c5ab3cb1f1181db63ddd9595f8d7d2266 100644
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH DIGEST-MD5
 SASL
+SASL AUTH DIGEST-MD5
 RFC2831
 RFC4954
 </keywords>
diff --git a/tests/data/test908 b/tests/data/test908
index e1f390161dd7145809d59be54f549fb1ad8f19c4..c471cb7b023d1a5c38eb976d871e19e79c7dc670 100644
--- a/tests/data/test908
+++ b/tests/data/test908
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH OAUTH2
 SASL
+SASL AUTH OAUTH2
 RFC4954
 RFC6749
 </keywords>
diff --git a/tests/data/test919 b/tests/data/test919
index ecb7a30980d288a814cb6bd4a1a4ff2b7b446d5e..3e74494cbd2c14593e733ee2e9d308b0b3ba7c0c 100644
--- a/tests/data/test919
+++ b/tests/data/test919
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH PLAIN
 SASL
+SASL AUTH PLAIN
 SASL-IR
 RFC4616
 RFC4954
diff --git a/tests/data/test920 b/tests/data/test920
index bccf3cbf17f43df51d80388e9c5c9f8e938e30b8..82f6c5601aeb202d0a0ffb86dc69db58ae1d10bd 100644
--- a/tests/data/test920
+++ b/tests/data/test920
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH LOGIN
 SASL
+SASL AUTH LOGIN
 SASL-IR
 RFC4954
 </keywords>
diff --git a/tests/data/test921 b/tests/data/test921
index 8c3197bcc85c8a9a2d6040d1df14212c30990c19..78ea8b6b58492575d21de442e832daaa8347e447 100644
--- a/tests/data/test921
+++ b/tests/data/test921
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM
 SASL
+SASL AUTH NTLM
 SASL-IR
 RFC4954
 </keywords>
diff --git a/tests/data/test922 b/tests/data/test922
index 3d528442e0b90ca5cdbd9ed88ffab6ea4ace35a1..e9e0d5f8e972e3edb0f191824cf06a7aedc47308 100644
--- a/tests/data/test922
+++ b/tests/data/test922
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH OAUTH2
 SASL
+SASL AUTH OAUTH2
 SASL-IR
 RFC4954
 RFC6749
diff --git a/tests/data/test932 b/tests/data/test932
index 902193e742c21e4f4888bafb9e71e8ad7e4923d6..13ab790d6f4e477b30d2bf469f59b8be2939c01f 100644
--- a/tests/data/test932
+++ b/tests/data/test932
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH CRAM-MD5
 SASL
+SASL AUTH CRAM-MD5
 SASL CANCELLATION
 RFC2195
 RFC4954
diff --git a/tests/data/test933 b/tests/data/test933
index 4879f1e44c3f1a80004dc0b5ac9f549aa792ad67..08b4e9dd00110ca8825fd5eade46c6cf0d8ae2ab 100644
--- a/tests/data/test933
+++ b/tests/data/test933
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM
 SASL
+SASL AUTH NTLM
 SASL CANCELLATION
 RFC4954
 </keywords>
diff --git a/tests/data/test934 b/tests/data/test934
index 1320ad2c1ec38232e7711f37ac0fb5167fb289a2..0be180376bf985ba8d369fb5da5da2fdb4b7bdb0 100644
--- a/tests/data/test934
+++ b/tests/data/test934
@@ -2,8 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH DIGEST-MD5
 SASL
+SASL AUTH DIGEST-MD5
 SASL CANCELLATION
 RFC2831
 RFC4954
diff --git a/tests/data/test935 b/tests/data/test935
index 14404d50fed165c80e4898974df024e3a8aff068..3fd5c2e503a7ad4c3d3829d04e9acdcf8bd06238 100644
--- a/tests/data/test935
+++ b/tests/data/test935
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH CRAM-MD5
-SMTP AUTH PLAIN
 SASL
+SASL AUTH CRAM-MD5
+SASL AUTH PLAIN
 SASL DOWNGRADE
 RFC2195
 RFC4954
diff --git a/tests/data/test936 b/tests/data/test936
index 35cc2d8c60840add9042e3a67b8bb29cf2c6552c..88c8a937e9afdc8a054f86f788475be3299e5954 100644
--- a/tests/data/test936
+++ b/tests/data/test936
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM
-SMTP AUTH PLAIN
 SASL
+SASL AUTH NTLM
+SASL AUTH PLAIN
 SASL DOWNGRADE
 RFC4954
 </keywords>
diff --git a/tests/data/test937 b/tests/data/test937
index f1e0ba7f3caa5c40a417146d6da1408bca720092..10f786c9771788aa652bc23dac07c3264d05ecbd 100644
--- a/tests/data/test937
+++ b/tests/data/test937
@@ -2,9 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH DIGEST-MD5
-SMTP AUTH PLAIN
 SASL
+SASL AUTH DIGEST-MD5
+SASL AUTH PLAIN
 SASL DOWNGRADE
 RFC2831
 RFC4954