diff --git a/doc/testing.md b/doc/testing.md
index 1d84099..a462b0f 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -6,7 +6,7 @@ feed some input to GPG Mailgate and inspect the output.
 
 ## Running tests
 
-To run tests, use command `make test`.
+To run tests, use command `make test` or `make unittest`.
 
 Tests produce some helpful logs, so inspect contents of `test/logs` directory
 if something goes wrong.
diff --git a/test/msgin/clear2clear.msg b/test/msgin/clear2clear.msg
index 5fe7ff7..ae577d1 100644
--- a/test/msgin/clear2clear.msg
+++ b/test/msgin/clear2clear.msg
@@ -1,5 +1,5 @@
-From: Bob <bob@localhost>
-To: Alice <alice@localhost>
+From: Dave <dave@localhost>
+To: Carlos <carlos@localhost>
 Subject: Test
 
 Body of the message.
diff --git a/test/msgin/clear2ed.msg b/test/msgin/clear2ed.msg
index 5fe7ff7..63b6c66 100644
--- a/test/msgin/clear2ed.msg
+++ b/test/msgin/clear2ed.msg
@@ -1,5 +1,5 @@
-From: Bob <bob@localhost>
-To: Alice <alice@localhost>
+From: Dave <dave@localhost>
+To: Bob <bob@localhost>
 Subject: Test
 
 Body of the message.
diff --git a/test/msgin/clear2rsa.msg b/test/msgin/clear2rsa.msg
index 5fe7ff7..9dfd134 100644
--- a/test/msgin/clear2rsa.msg
+++ b/test/msgin/clear2rsa.msg
@@ -1,4 +1,4 @@
-From: Bob <bob@localhost>
+From: Dave <dave@localhost>
 To: Alice <alice@localhost>
 Subject: Test
 
diff --git a/test/msgout/clear2clear.msg b/test/msgout/clear2clear.msg
deleted file mode 100644
index 5fe7ff7..0000000
--- a/test/msgout/clear2clear.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-From: Bob <bob@localhost>
-To: Alice <alice@localhost>
-Subject: Test
-
-Body of the message.
diff --git a/test/msgout/clear2ed.msg b/test/msgout/clear2ed.msg
deleted file mode 100644
index 5fe7ff7..0000000
--- a/test/msgout/clear2ed.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-From: Bob <bob@localhost>
-To: Alice <alice@localhost>
-Subject: Test
-
-Body of the message.
diff --git a/test/msgout/clear2rsa.msg b/test/msgout/clear2rsa.msg
deleted file mode 100644
index 5fe7ff7..0000000
--- a/test/msgout/clear2rsa.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-From: Bob <bob@localhost>
-To: Alice <alice@localhost>
-Subject: Test
-
-Body of the message.