diff --git a/test/vader/delims.vader b/test/vader/delims.vader
index b7f8125..080c2e5 100644
--- a/test/vader/delims.vader
+++ b/test/vader/delims.vader
@@ -1,13 +1,13 @@
-Given tex (Some complicated delimited math):
+Given tex (Delims: toggle in complicated math):
   $\bigl(\begin{smallmatrix}
     \Q^* &   \\
          & 1 \\
   \end{smallmatrix}\bigr)$
 
-Do (Toggle math delimiters):
+Do (Toggle):
   3jtsd
 
-Expect tex (Toggled math delimiters):
+Expect tex (Verify):
   $(\begin{smallmatrix}
     \Q^* &   \\
          & 1 \\
diff --git a/test/vader/format.vader b/test/vader/format.vader
index 3b4c62a..3581f1b 100644
--- a/test/vader/format.vader
+++ b/test/vader/format.vader
@@ -3,7 +3,7 @@ Execute (Setup):
   let g:vimtex_format_enabled = 1
   silent! VimtexReload
 
-Given tex (Format inline comment):
+Given tex (Format: Inline comment):
   Lorem ipsum dolor sit amet, consetetur sadipscing % a comment
   elitr, sed diam
   nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
@@ -11,10 +11,10 @@ Given tex (Format inline comment):
   rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem
   ipsum dolor sit amet.
 
-Do:
+Do (Format text):
   gqG
 
-Expect tex:
+Expect tex (Verify):
   Lorem ipsum dolor sit amet, consetetur sadipscing % a comment
   elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna
   aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores
diff --git a/test/vader/indentation.vader b/test/vader/indentation.vader
index 909f0df..acc34a4 100644
--- a/test/vader/indentation.vader
+++ b/test/vader/indentation.vader
@@ -1,7 +1,7 @@
 Execute (Setup):
   set shiftwidth=2
 
-Given tex (Indent regular tex):
+Given tex (Indent: regular tex):
   \documentclass{minimal}
   \usepackage{amsmath}
   \usepackage{tikz}
@@ -13,10 +13,10 @@ Given tex (Indent regular tex):
 
     \end{document}
 
-Do:
+Do (Indent):
   gg=G
 
-Expect tex:
+Expect tex (Verify):
   \documentclass{minimal}
   \usepackage{amsmath}
   \usepackage{tikz}
@@ -28,7 +28,7 @@ Expect tex:
 
   \end{document}
 
-Given tex (Indent lists):
+Given tex (Indent: lists):
   \begin{itemize}
   \item item is indented twice
         and the next line is indented to match
@@ -41,10 +41,10 @@ Given tex (Indent lists):
     (Author): commentaries here
   \end{description}
 
-Do:
+Do (Indent):
   gg=G
 
-Expect tex:
+Expect tex (Verify):
   \begin{itemize}
     \item item is indented twice
       and the next line is indented to match
@@ -57,7 +57,7 @@ Expect tex:
       (Author): commentaries here
   \end{description}
 
-Given tex (Indent math):
+Given tex (Indent: math):
       \[
     1+1
         \]
@@ -75,10 +75,10 @@ Given tex (Indent math):
   \right.
   \end{equation}
 
-Do:
+Do (Indent):
   gg=G
 
-Expect tex:
+Expect tex (Verify):
   \[
     1+1
   \]
@@ -96,7 +96,7 @@ Expect tex:
     \right.
   \end{equation}
 
-Given tex (Indent tikz):
+Given tex (Indent: tikz):
   \tikz \fill[green] rectangle (0.5,0.5); Something
       about something.
 
@@ -119,10 +119,10 @@ Given tex (Indent tikz):
         node [yshift=-.25cm] {(ii)};
        \end{tikzpicture}
 
-Do:
+Do (Indent):
   gg=G
 
-Expect tex:
+Expect tex (Verify):
   \tikz \fill[green] rectangle (0.5,0.5); Something
   about something.
 
@@ -145,7 +145,7 @@ Expect tex:
       node [yshift=-.25cm] {(ii)};
   \end{tikzpicture}
 
-Given tex (Indent verbatims):
+Given tex (Indent: verbatims):
     \begin{verbatim}
   #!/bin/bash
   echo "test"
@@ -157,10 +157,10 @@ Given tex (Indent verbatims):
       not affect verbatim environments!
       \end{lstlisting}
 
-Do:
+Do (Indent):
   gg=G
 
-Expect tex:
+Expect tex (Verify):
   \begin{verbatim}
   #!/bin/bash
   echo "test"
diff --git a/test/vader/textobj_envs.vader b/test/vader/textobj_envs.vader
index 371c7ae..fa2e8a5 100644
--- a/test/vader/textobj_envs.vader
+++ b/test/vader/textobj_envs.vader
@@ -1,4 +1,4 @@
-Given tex (Complex environment):
+Given tex (Define complex environment):
   \begin{complexenvironment}[option1,
     option2]{first extra argument}
     {second extra
@@ -6,19 +6,19 @@ Given tex (Complex environment):
     Hello world!
   \end{complexenvironment}
 
-Do (Delete inner):
+Do (Delete environment (excluding)):
   die
 
-Expect tex (Inner deleted):
+Expect tex (Verify):
   \begin{complexenvironment}[option1,
     option2]{first extra argument}
     {second extra
     argument}
   \end{complexenvironment}
 
-Do (Delete outer):
+Do (Delete environment (including)):
   dae
 
-Expect tex (Outer deleted):
+Expect tex (Verify):