diff --git a/development/autotests/bug-7673-in.txt b/development/autotests/bug-7673-in.txt
index c12981b913..446209c920 100644
--- a/development/autotests/bug-7673-in.txt
+++ b/development/autotests/bug-7673-in.txt
@@ -1,7 +1,7 @@
 # see http://www.lyx.org/trac/ticket/7673#comment:15
 #
 Lang en_US.utf8
-TestBegin ../bug-7673.lyx > bug-7673.loga.txt 2>&1
+TestBegin -dbg key ../bug-7673.lyx > bug-7673.loga.txt 2>&1
 # 'outline-in' was needed to reproduce the crash on some commits when bisecting
 KK: \Axcommand-sequence repeat 3 char-forward; outline-in; down; down\[Return]
 TestEnd
diff --git a/development/autotests/bug-7673b-in.txt b/development/autotests/bug-7673b-in.txt
index df36c4bda7..ecd775bb19 100644
--- a/development/autotests/bug-7673b-in.txt
+++ b/development/autotests/bug-7673b-in.txt
@@ -1,6 +1,6 @@
 # based on the steps to reproduce #7673 in the original report
 #
 Lang en_US.utf8
-TestBegin > bug-7673b.loga.txt 2>&1
+TestBegin -dbg key > bug-7673b.loga.txt 2>&1
 KK: \Axcommand-sequence buffer-new; layout Itemize; self-insert a; paragraph-break; depth-increment; self-insert b; up; char-delete-backward; down\[Return]
 TestEnd
diff --git a/development/autotests/bug-8370-in.txt b/development/autotests/bug-8370-in.txt
index 0cfd1e2220..5c13152b78 100644
--- a/development/autotests/bug-8370-in.txt
+++ b/development/autotests/bug-8370-in.txt
@@ -1,6 +1,6 @@
 # .lyx file is from http://www.lyx.org/trac/ticket/8370#comment:8
 #
 Lang en_US.utf8
-TestBegin ../bug-8370.lyx > bug-8370.loga.txt 2>&1
+TestBegin -dbg key ../bug-8370.lyx > bug-8370.loga.txt 2>&1
 KK: \Axcommand-sequence change-next; change-reject; change-next\[Return]
 TestEnd
diff --git a/development/autotests/bug-8482-in.txt b/development/autotests/bug-8482-in.txt
index 616ae98247..37bbb5a328 100644
--- a/development/autotests/bug-8482-in.txt
+++ b/development/autotests/bug-8482-in.txt
@@ -4,7 +4,7 @@
 # is cleared after the next test starts.
 
 Lang en_US.utf8
-TestBegin test.lyx > bug-8482.loga.txt 2>&1
+TestBegin -dbg key test.lyx > bug-8482.loga.txt 2>&1
 KK: \Cm
 KK: \Ai
 TestEnd
diff --git a/development/autotests/bug-8540-in.txt b/development/autotests/bug-8540-in.txt
index 785d459667..446fe2f906 100644
--- a/development/autotests/bug-8540-in.txt
+++ b/development/autotests/bug-8540-in.txt
@@ -2,7 +2,7 @@
 #
 Lang en_US.utf8
 
-TestBegin > bug-8540.loga.txt 2>&1
+TestBegin -dbg key > bug-8540.loga.txt 2>&1
 KK: \Axlyxrc-apply \\spellchecker enchant\[Return]
 KK: \Axlyxrc-apply \\spellchecker enchant\[Return]
 TestEnd
diff --git a/development/autotests/bug-8684-in.txt b/development/autotests/bug-8684-in.txt
index d72ea3fda9..25a40da79f 100644
--- a/development/autotests/bug-8684-in.txt
+++ b/development/autotests/bug-8684-in.txt
@@ -1,8 +1,8 @@
 Lang en_US.utf8
-TestBegin ../bug-8684.lyx > bug-8684.loga.txt 2>&1
+TestBegin -dbg key ../bug-8684.lyx > bug-8684.loga.txt 2>&1
 KK: \Axcommand-sequence change-next; change-reject; change-next\[Return]
 TestEnd
 
-TestBegin ../bug-8684.lyx > bug-8684.logb.txt 2>&1
+TestBegin -dbg key ../bug-8684.lyx > bug-8684.logb.txt 2>&1
 KK: \Axcommand-sequence char-forward; change-next\[Return]
 TestEnd
diff --git a/development/autotests/bug-export-latex-in.txt b/development/autotests/bug-export-latex-in.txt
index 3f6a72a9fd..0f555d2ee3 100644
--- a/development/autotests/bug-export-latex-in.txt
+++ b/development/autotests/bug-export-latex-in.txt
@@ -4,7 +4,7 @@
 # 
 
 Lang C
-TestBegin -dbg files test.lyx > bug-export-latex.loga.txt 2>&1
+TestBegin -dbg key,files test.lyx > bug-export-latex.loga.txt 2>&1
 KK: \Axinfo-insert icon math-mode\[Return]
 KK: \Axbuffer-export luatex\[Return]
 KK: \[Tab]\[Return]
diff --git a/development/autotests/bug-math-undo-in.txt b/development/autotests/bug-math-undo-in.txt
index 1483cb53c5..dabd18cec8 100644
--- a/development/autotests/bug-math-undo-in.txt
+++ b/development/autotests/bug-math-undo-in.txt
@@ -2,7 +2,7 @@
 # 
 
 Lang C
-TestBegin test.lyx > bug-math-undo.loga.txt 2>&1
+TestBegin -dbg key test.lyx > bug-math-undo.loga.txt 2>&1
 KK: \Amm\\frac \\sqrt \Cz
 KK: \[Return]
 TestEnd
diff --git a/development/autotests/findadv-01-in.txt b/development/autotests/findadv-01-in.txt
index 21601e2177..1024847681 100644
--- a/development/autotests/findadv-01-in.txt
+++ b/development/autotests/findadv-01-in.txt
@@ -2,7 +2,7 @@
 # match should not consider the just replaced text (#4388)
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-01.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-01.loga.txt 2>&1
 KK: aaa\[Home]
 KK: \CF
 KK: a\[Tab]
diff --git a/development/autotests/findadv-02-in.txt b/development/autotests/findadv-02-in.txt
index f68e63f439..7099ba554d 100644
--- a/development/autotests/findadv-02-in.txt
+++ b/development/autotests/findadv-02-in.txt
@@ -1,7 +1,7 @@
 # Basic test on refactoring of mathematics notation
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-02.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-02.loga.txt 2>&1
 KK: \Cm
 KK: x^(a) +\\frac 1+x^(a) \[Down]1-x^(a)  \C\[Home]
 KK: \CF
diff --git a/development/autotests/findadv-03-in.txt b/development/autotests/findadv-03-in.txt
index 0882f21ea2..e0ce039d85 100644
--- a/development/autotests/findadv-03-in.txt
+++ b/development/autotests/findadv-03-in.txt
@@ -1,6 +1,6 @@
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-03.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-03.loga.txt 2>&1
 KK: \Cm
 KK: x^2 -x^2\C\[Home]
 KK: \Cs
@@ -10,7 +10,7 @@ KK: x^2\[Return]
 Lang C
 TestEnd pcregrep -M "Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0" findadv-03.loga.txt
 Lang it_IT.utf8
-TestBegin test2.lyx -dbg find > findadv-03.logb.txt 2>&1
+TestBegin test2.lyx -dbg key,find > findadv-03.logb.txt 2>&1
 KK: \Cm
 KK: x^2 -x^2\C\[Home]
 KK: \Cs
diff --git a/development/autotests/findadv-04-in.txt b/development/autotests/findadv-04-in.txt
index 95bed607c1..caacb43601 100644
--- a/development/autotests/findadv-04-in.txt
+++ b/development/autotests/findadv-04-in.txt
@@ -1,7 +1,7 @@
 # Regression test for #7245
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-04.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-04.loga.txt 2>&1
 KK: \Cm
 KK: x^2  \[Return]
 KK: \Cm
diff --git a/development/autotests/findadv-05-in.txt b/development/autotests/findadv-05-in.txt
index e13d9f6c83..0b1ac85e23 100644
--- a/development/autotests/findadv-05-in.txt
+++ b/development/autotests/findadv-05-in.txt
@@ -1,7 +1,7 @@
 # Basic test for format-aware searching
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-05.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-05.loga.txt 2>&1
 KK: foo \Cefoo foo\Ce foo\C\[Home]
 KK: \Cs
 KK: \CF
@@ -14,7 +14,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 4\n with len: 3' findadv-05.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-05.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-05.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-06-in.txt b/development/autotests/findadv-06-in.txt
index 58c2b64c78..637ea5ce64 100644
--- a/development/autotests/findadv-06-in.txt
+++ b/development/autotests/findadv-06-in.txt
@@ -1,7 +1,7 @@
 # Basic test for searching with par-style awareness
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-06.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-06.loga.txt 2>&1
 KK: foo\[Return]
 KK: \Ap2
 KK: foo\[Return]
@@ -19,7 +19,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 1 pos: 0\n with len: 3' findadv-06.loga.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-06.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-06.logb.txt 2>&1
 KK: \C\[Home]
 KK: \Axdialog-show findreplaceadv\[Return]
 # Uncheck ignore format
diff --git a/development/autotests/findadv-07-in.txt b/development/autotests/findadv-07-in.txt
index f475f54ff7..2ed3f7ac86 100644
--- a/development/autotests/findadv-07-in.txt
+++ b/development/autotests/findadv-07-in.txt
@@ -1,7 +1,7 @@
 # Basic test for searching with par-style awareness
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-07.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-07.loga.txt 2>&1
 KK: foo bar\[Return]
 #select itemized
 KK: \Apb
@@ -19,7 +19,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 1 pos: 0\n with len: 3' findadv-07.loga.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-07.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-07.logb.txt 2>&1
 KK: \C\[Home]
 KK: \CF
 # Uncheck ignore format
diff --git a/development/autotests/findadv-08-in.txt b/development/autotests/findadv-08-in.txt
index b46ec36e50..041db80647 100644
--- a/development/autotests/findadv-08-in.txt
+++ b/development/autotests/findadv-08-in.txt
@@ -1,7 +1,7 @@
 # Basic test for searching with regular expressions
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-08.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-08.loga.txt 2>&1
 KK: Nel mezzo del cammin di nostra vita\[Return]
 KK: mi ritrovai per una selva oscura\C\[Home]
 KK: \Axbuffer-write\[Return]
@@ -14,7 +14,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 8\n with len: 8' findadv-08.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-08.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-08.logb.txt 2>&1
 KK: \C\[Home]\Axdialog-show findreplaceadv\[Return]
 KK: o
 KK: \Axregexp-mode\[Return]
@@ -29,7 +29,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 1 pos: 26\n with len: 6' findadv-08.logb.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-08.logc.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-08.logc.txt 2>&1
 KK: \C\[Home]\Axdialog-show findreplaceadv\[Return]
 KK: \Axregexp-mode\[Return]
 KK: .* \Ac\Ac
diff --git a/development/autotests/findadv-09-in.txt b/development/autotests/findadv-09-in.txt
index abd42a66e3..c60c570ab0 100644
--- a/development/autotests/findadv-09-in.txt
+++ b/development/autotests/findadv-09-in.txt
@@ -1,7 +1,7 @@
 # Test for searching with regular expressions
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-09.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-09.loga.txt 2>&1
 KK: \Apb
 KK: one\[Return]two\[Return]three\C\[Home]\Cs
 KK: \CF
@@ -14,7 +14,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 3' findadv-09.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-09.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-09.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-10-in.txt b/development/autotests/findadv-10-in.txt
index a233519bef..66b60654e4 100644
--- a/development/autotests/findadv-10-in.txt
+++ b/development/autotests/findadv-10-in.txt
@@ -2,7 +2,7 @@
 # when ignoring format
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-10.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-10.loga.txt 2>&1
 KK: This is LyX,\[Return]
 KK: a WYSIWYG LaTeX editor.\C\[Home]
 KK: \Cs
@@ -15,7 +15,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 8\n with len: 3' findadv-10.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-10.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-10.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-11-in.txt b/development/autotests/findadv-11-in.txt
index dbb8ad5d13..d184f755ef 100644
--- a/development/autotests/findadv-11-in.txt
+++ b/development/autotests/findadv-11-in.txt
@@ -1,7 +1,7 @@
 # Inspired by #7363.
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-11.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-11.loga.txt 2>&1
 KK: \Cm
 KK: x_v \C\[Home]
 KK: \Cs
@@ -13,7 +13,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n.*idx: 1 par: 0 pos: 0\n with len: 1' findadv-11.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-11.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-11.logb.txt 2>&1
 KK: \C\[Home]
 KK: \CF
 # Uncheck ignore format
diff --git a/development/autotests/findadv-12-in.txt b/development/autotests/findadv-12-in.txt
index c16a113171..2cc8491396 100644
--- a/development/autotests/findadv-12-in.txt
+++ b/development/autotests/findadv-12-in.txt
@@ -3,7 +3,7 @@
 # (#7442)
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-12.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-12.loga.txt 2>&1
 KK: a\C\[Home]
 KK: \CF
 KK: a\[Tab]
diff --git a/development/autotests/findadv-13-in.txt b/development/autotests/findadv-13-in.txt
index 06ce1a8af2..52a7065396 100644
--- a/development/autotests/findadv-13-in.txt
+++ b/development/autotests/findadv-13-in.txt
@@ -1,7 +1,7 @@
 # Finding footnotes
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-13.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-13.loga.txt 2>&1
 KK: \Axfootnote-insert\[Return]
 # Work around a little UI bug/non-determinism in cursor position after LFUN
 KK: \C\[Home]\[Right]
diff --git a/development/autotests/findadv-14-in.txt b/development/autotests/findadv-14-in.txt
index f437271259..8b6c7a4856 100644
--- a/development/autotests/findadv-14-in.txt
+++ b/development/autotests/findadv-14-in.txt
@@ -1,7 +1,7 @@
 # Finding displayed maths with ignore-format on&off (might affect #7596)
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-14.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-14.loga.txt 2>&1
 KK: \Axmath-display\[Return]
 KK: x^2 +x^2\C\[Home]
 KK: \Cs
@@ -15,7 +15,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with len: 1' findadv-14.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-14.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-14.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
@@ -26,7 +26,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 2\n with len: 1' findadv-14.logb.txt
 
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-14.logc.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-14.logc.txt 2>&1
 KK: \CF
 KK: \Axmath-display\[Return]
 KK: x^2\[Return]
@@ -35,7 +35,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with len: 1' findadv-14.logc.txt
 
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-14.logd.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-14.logd.txt 2>&1
 KK: \CF
 KK: \Axmath-display\[Return]
 KK: x^2\[Return]\[Return]
diff --git a/development/autotests/findadv-15-in.txt b/development/autotests/findadv-15-in.txt
index 23cf564c91..b5e28e2aff 100644
--- a/development/autotests/findadv-15-in.txt
+++ b/development/autotests/findadv-15-in.txt
@@ -1,7 +1,7 @@
 # Finding numbered maths with ignore-format on&off (might affect #7596)
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-15.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-15.loga.txt 2>&1
 KK: \CM\Axmath-number-toggle\[Return]
 KK: x^2 +x^2\C\[Home]
 KK: \Cs
@@ -15,7 +15,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with len: 1' findadv-15.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-15.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-15.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
@@ -26,7 +26,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 2\n with len: 1' findadv-15.logb.txt
 
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-15.logc.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-15.logc.txt 2>&1
 KK: \CF
 KK: \CM\Axmath-number-toggle\[Return]
 KK: x^2\[Return]
@@ -35,7 +35,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with len: 1' findadv-15.logc.txt
 
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-15.logd.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-15.logd.txt 2>&1
 KK: \CF
 KK: \CM\Axmath-number-toggle\[Return]
 KK: x^2\[Return]\[Return]
diff --git a/development/autotests/findadv-16-in.txt b/development/autotests/findadv-16-in.txt
index 4bdae57d2c..5c36c6d3e8 100644
--- a/development/autotests/findadv-16-in.txt
+++ b/development/autotests/findadv-16-in.txt
@@ -2,7 +2,7 @@
 # (gather environment comes in the *-form after mutate)
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-16.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-16.loga.txt 2>&1
 KK: \CM\Axmath-mutate gather\[Return]
 KK: x^2 +x^2\C\[Home]
 KK: \Cs
@@ -16,7 +16,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with len: 1' findadv-16.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-16.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-16.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-17-in.txt b/development/autotests/findadv-17-in.txt
index 986dd32ff5..8de0722a6a 100644
--- a/development/autotests/findadv-17-in.txt
+++ b/development/autotests/findadv-17-in.txt
@@ -1,7 +1,7 @@
 # Finding consecutive macros in math mode
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-17.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-17.loga.txt 2>&1
 KK: \Cm\\alpha\\beta\\alpha \C\[Home]
 KK: \Cs
 KK: \CF
@@ -11,7 +11,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 1\n with len: 2' findadv-17.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-17.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-17.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-18-in.txt b/development/autotests/findadv-18-in.txt
index 2de829c539..c899c0ed26 100644
--- a/development/autotests/findadv-18-in.txt
+++ b/development/autotests/findadv-18-in.txt
@@ -1,7 +1,7 @@
 # Searching for regexp with e.g. \[Backspace]\[Backspace]s finds blanks
 
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-18.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-18.loga.txt 2>&1
 KK: a b c\C\[Home]
 KK: \Cs
 KK: \CF
diff --git a/development/autotests/findadv-19-in.txt b/development/autotests/findadv-19-in.txt
index c6e91b513a..52a434a305 100644
--- a/development/autotests/findadv-19-in.txt
+++ b/development/autotests/findadv-19-in.txt
@@ -1,7 +1,7 @@
 # Check that searching for regexp "([a-z]+)\s\1" finds duplicate words.
 
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-19.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-19.loga.txt 2>&1
 KK: Hello world world!\C\[Home]
 KK: \Cs
 KK: \CF
diff --git a/development/autotests/findadv-20-in.txt b/development/autotests/findadv-20-in.txt
index a5b7d03b98..e1d56a2ba4 100644
--- a/development/autotests/findadv-20-in.txt
+++ b/development/autotests/findadv-20-in.txt
@@ -3,7 +3,7 @@
 #
 Lang it_IT.utf8
 
-TestBegin test.lyx -dbg find > findadv-20.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-20.loga.txt 2>&1
 KK: a a a\C\[Home]
 KK: \CF
 KK: a\[Tab]
@@ -15,7 +15,7 @@ Lang C
 Assert pcregrep -M '^\$\\frac\{1\}\{a\}\$ \$\\frac\{1\}\{a\}\$ a' test.tex
 
 Lang it_IT.utf8
-TestBegin test2.lyx -dbg find > findadv-20.logb.txt 2>&1
+TestBegin test2.lyx -dbg key,find > findadv-20.logb.txt 2>&1
 KK: \Cma  \Cma  \Cma \C\[Home]
 KK: \CF
 KK: a\[Tab]
diff --git a/development/autotests/findadv-21-in.txt b/development/autotests/findadv-21-in.txt
index 4df5793541..a158b86949 100644
--- a/development/autotests/findadv-21-in.txt
+++ b/development/autotests/findadv-21-in.txt
@@ -2,7 +2,7 @@
 # Test for #8381
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-21.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-21.loga.txt 2>&1
 KK: \Apb
 KK: one\[Return]
 KK: two\[Return]
@@ -27,7 +27,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at cur= inset: .* idx: 0 par: 3 pos: 0\n with len: 4' findadv-21.loga.txt
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-21.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-21.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-crash-in.txt b/development/autotests/findadv-crash-in.txt
index 49ee5f7e70..246f958895 100644
--- a/development/autotests/findadv-crash-in.txt
+++ b/development/autotests/findadv-crash-in.txt
@@ -2,7 +2,7 @@
 # Crash in using function 'word-findadv'
 
 Lang C
-TestBegin test.lyx -dbg find > findadv-crash.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-crash.loga.txt 2>&1
 KK: abcd
 KK: \Axword-findadv a\[Return]
 TestEnd
diff --git a/development/autotests/findadv-logo-in.txt b/development/autotests/findadv-logo-in.txt
index c5d4009499..f43ebcd62b 100644
--- a/development/autotests/findadv-logo-in.txt
+++ b/development/autotests/findadv-logo-in.txt
@@ -2,7 +2,7 @@
 # when ignoring format
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-logo.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-logo.loga.txt 2>&1
 KK: This should be a LaTeX logo: 
 KK: \Axspecialchar-insert lyx\[Return]\[Return]
 KK: for a WYSIWYG LaTeX editor.\C\[Home]
diff --git a/development/autotests/findadv-re-01-in.txt b/development/autotests/findadv-re-01-in.txt
index 0614309b80..766433ce6b 100644
--- a/development/autotests/findadv-re-01-in.txt
+++ b/development/autotests/findadv-re-01-in.txt
@@ -1,7 +1,7 @@
 # Finding special latex/regexp chars: (
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-re-01.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-01.loga.txt 2>&1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
@@ -11,7 +11,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 1\n with len: 1' findadv-re-01.loga.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-01.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-01.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
@@ -23,7 +23,7 @@ Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 1\n with len: 1' f
 # Finding special latex/regexp chars: [
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-re-01.logc.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-01.logc.txt 2>&1
 KK: \CF
 KK: \Axregexp-mode\[Return]\\[\[Return]
 TestEnd
@@ -31,7 +31,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 3\n with len: 1' findadv-re-01.logc.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-01.logd.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-01.logd.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-re-02-in.txt b/development/autotests/findadv-re-02-in.txt
index 530199817b..a435db495a 100644
--- a/development/autotests/findadv-re-02-in.txt
+++ b/development/autotests/findadv-re-02-in.txt
@@ -1,7 +1,7 @@
 # Finding special latex/regexp chars: \
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-re-02.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-02.loga.txt 2>&1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
@@ -11,7 +11,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 1' findadv-re-02.loga.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-02.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-02.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
@@ -23,7 +23,7 @@ Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 1' f
 # Finding special latex/regexp chars: %
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-re-02.logc.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-02.logc.txt 2>&1
 KK: \CF
 KK: \Axregexp-mode\[Return]%\[Return]
 TestEnd
@@ -31,7 +31,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 7\n with len: 1' findadv-re-02.logc.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-02.logd.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-02.logd.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
@@ -43,7 +43,7 @@ Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 7\n with len: 1' f
 # Finding special latex/regexp chars: ^
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-re-02.loge.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-02.loge.txt 2>&1
 KK: \CF
 KK: \Axregexp-mode\[Return]\\^\[Return]
 TestEnd
@@ -51,7 +51,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 8\n with len: 1' findadv-re-02.loge.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-02.logf.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-02.logf.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-re-03-in.txt b/development/autotests/findadv-re-03-in.txt
index f42b6ca695..2727c01d35 100644
--- a/development/autotests/findadv-re-03-in.txt
+++ b/development/autotests/findadv-re-03-in.txt
@@ -1,7 +1,7 @@
 # Finding special latex/regexp chars: {
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-re-03.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-03.loga.txt 2>&1
 KK: \\()[]{}%^#@?*.\C\[Home]
 KK: \Cs
 KK: \CF
@@ -11,7 +11,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 5\n with len: 1' findadv-re-03.loga.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-03.logb.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-03.logb.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
@@ -23,7 +23,7 @@ Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 5\n with len: 1' f
 # Finding special latex/regexp chars: }
 #
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-re-03.logc.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-03.logc.txt 2>&1
 KK: \CF
 KK: \Axregexp-mode\[Return]\\}\[Return]
 TestEnd
@@ -31,7 +31,7 @@ Lang C
 Assert pcregrep -M 'Putting selection at .*idx: 0 par: 0 pos: 6\n with len: 1' findadv-re-03.logc.txt
 #
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-03.logd.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-03.logd.txt 2>&1
 KK: \CF
 # Uncheck ignore format
 KK: \At\Ai\Ah
diff --git a/development/autotests/findadv-re-04-in.txt b/development/autotests/findadv-re-04-in.txt
index 20d350b8b3..36f4137eea 100644
--- a/development/autotests/findadv-re-04-in.txt
+++ b/development/autotests/findadv-re-04-in.txt
@@ -1,7 +1,7 @@
 # Finding styles with regexp
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-04.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-04.loga.txt 2>&1
 KK: Hello \CeHello\C\[Home]
 KK: \Cs
 KK: \CF
diff --git a/development/autotests/findadv-re-05-in.txt b/development/autotests/findadv-re-05-in.txt
index 7b9105ae50..2b2371153a 100644
--- a/development/autotests/findadv-re-05-in.txt
+++ b/development/autotests/findadv-re-05-in.txt
@@ -9,7 +9,7 @@
 # ask if the cursor started at the beginning of the buffer).
 
 Lang it_IT.utf8
-TestBegin test.lyx -dbg find > findadv-re-05.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-05.loga.txt 2>&1
 KK: \Cm\\frac 1-x\[Down]1+x^2 \C\[Home]
 KK: \CF
 KK: \Cm\\frac \Axregexp-mode\[Return].* \[Down]1+x^2 \[Return]
diff --git a/development/autotests/findadv-re-06-in.txt b/development/autotests/findadv-re-06-in.txt
index cb1864000e..a53ff7dc8d 100644
--- a/development/autotests/findadv-re-06-in.txt
+++ b/development/autotests/findadv-re-06-in.txt
@@ -1,7 +1,7 @@
 # Finding regexps within \frac{}
 
 Lang sk_SK.utf8
-TestBegin test.lyx -dbg find > findadv-re-06.loga.txt 2>&1
+TestBegin test.lyx -dbg key,find > findadv-re-06.loga.txt 2>&1
 KK: \Cm\\frac 1-x\[Down]1+x^2 \C\[Home]
 KK: \CF
 # Uncheck ignore format (depends on IT language)
diff --git a/development/autotests/first-time-in.txt b/development/autotests/first-time-in.txt
index 6761948ce4..36132397c8 100644
--- a/development/autotests/first-time-in.txt
+++ b/development/autotests/first-time-in.txt
@@ -1,4 +1,4 @@
 Lang en_US.utf8
-TestBegin test.lyx > first-time.loga.txt 2>&1
+TestBegin -dbg key test.lyx > first-time.loga.txt 2>&1
 KK: \[Left]\[Return]
 TestEnd
diff --git a/development/autotests/tabular-footnote-in.txt b/development/autotests/tabular-footnote-in.txt
index eb109a2820..bea8ca49f2 100644
--- a/development/autotests/tabular-footnote-in.txt
+++ b/development/autotests/tabular-footnote-in.txt
@@ -2,7 +2,7 @@
 # (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg167716.html)
 #
 Lang it_IT.utf8
-TestBegin test.lyx > tabular-footnote.loga.txt 2>&1
+TestBegin test.lyx -dbg key > tabular-footnote.loga.txt 2>&1
 KK: \Axtabular-insert 1 1\[Return]\[Left]
 KK: \Axinset-modify tabular align-decimal\[Return]
 KK: \Axfootnote-insert\[Return]