diff --git a/tests/data/test819 b/tests/data/test819
index 5d5481103..d0aa47ba5 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 3f06029b7..f638f1cb6 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 55f10633b..aee373b9a 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 7e420783e..aef4fd5e4 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 d1deca22c..5e4d59356 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 3b64d1f66..242c1b4a3 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 5a31058c7..6532b3ace 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 174b2d4c0..0f9282945 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 f1469779a..ed19fc67f 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 c4f05776f..b2fb693ff 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 3dd58e6bc..5803bb11e 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 77471d9be..8bff7eac0 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 42ae9035d..4873e3569 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 a18593b9e..b5fa03f9e 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 5a447412b..17101ddfc 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 e6d810744..2379a3abb 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 1aa73a5c7..6f66f82d7 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 cebb23899..8fee23ab0 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 ab029917a..139b467de 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 515dfbecb..861e5e679 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 42fb9eaa1..8350373c0 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 73e3cd674..885b8c159 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 6b3d1daf8..f4f236041 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 08ee46057..05cb2a206 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 0302c982c..43f9eb87c 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 4371a2fe4..de221fa91 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 213fa775a..6d30e538b 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 de40d32bd..c4775942f 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 a5bc8c090..9027b0b47 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 70f7b157c..681d779b2 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 3a920fdcd..f5eb69731 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 3ce5564c2..02ac8fbd8 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 a06052d7d..2baf5e696 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 000689781..dd3dad09b 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 9e239267a..565b04136 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 81dd3770e..01f0dd207 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 9f785326c..16a4338c5 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 e1f390161..c471cb7b0 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 ecb7a3098..3e74494cb 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 bccf3cbf1..82f6c5601 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 8c3197bcc..78ea8b6b5 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 3d528442e..e9e0d5f8e 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 902193e74..13ab790d6 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 4879f1e44..08b4e9dd0 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 1320ad2c1..0be180376 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 14404d50f..3fd5c2e50 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 35cc2d8c6..88c8a937e 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 f1e0ba7f3..10f786c97 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