diff --git a/test-data/message/aol_ndn.eml b/test-data/message/aol_ndn.eml
deleted file mode 100644
index d0f5188b8..000000000
--- a/test-data/message/aol_ndn.eml
+++ /dev/null
@@ -1,100 +0,0 @@
-X-Atlas-Received: from 10.218.248.40 by atlas207.aol.mail.ne1.yahoo.com with http; Wed, 10 Jun 2020 10:42:33 +0000
-Return-Path: <>
-Received: from 74.6.131.123 (EHLO sonic311-13.consmr.mail.bf2.yahoo.com)
- by atlas207.aol.mail.ne1.yahoo.com with SMTPs; Wed, 10 Jun 2020 10:42:33 +0000
-X-Originating-Ip: [74.6.131.123]
-Received-SPF: none (domain of sonic311-13.consmr.mail.bf2.yahoo.com does not designate permitted sender hosts)
-Authentication-Results: atlas207.aol.mail.ne1.yahoo.com;
- dkim=pass header.i=@yahoo.com header.s=@bounce;
- spf=none smtp.mailfrom=sonic311-13.consmr.mail.bf2.yahoo.com;
- dmarc=success(p=REJECT) header.from=yahoo.com;
-X-Apparently-To: deltachattestac@aol.com; Wed, 10 Jun 2020 10:42:33 +0000
-X-YMailISG: DkLFz_oWLDvt4_NIgCwKD1jZui63WnISNmlXQ_XYR2MqQH9y
- Sa__GenYvUZEmGPWcZU0SLRtkdYKB66hm6jbzx7Pw4j6es6aXyOHs91T5xeW
- Bvqm5IjytmXBG.ELVw0MjCKEPx36Wr5pptHuryDWttC8.qeN9w_SZy1kXtkE
- vJDjXD1IIMZ1XpywJyBYu3Ld3AKkTd0mU3V7wbq3LY8A3dsgO7Gv8Doq4PyJ
- 6DxK2NqUp.GOAjj_9pH97OFJCeUCjc.dlEVPbrvfBUPimoluyG00EnyyyhjL
- KnDZiAZnCVUA9H2lfM0uWqNCF7CowDoehVecVHpiLJ7Xl415wQjOjWSTzatA
- Buh2hsSQDbpPRLZbjnY0B4sC1vMKnCm3B2P04KYEWs7W_m_Ysvtidkg1SyKR
- vsm8UDlDfLFSNtaE6LuxkgK90hVfM3qHXpnAPnUkB626ucgZAJDvXMg3q_S.
- rMOcm0e5LPVON_LjqMSefreahzGebN88_klofvxDaBm7EZIFd933_EWrJ1yZ
- P_hp5lPTaYmFTuukp8UR9ZfwVCbz6FmUzQwbNvGsmWgI2mVxgGgCay4OJKOk
- gyTyQXzDGitU82HsLfgpIricWWdou7tlkwUQXv2w6p1.QbmbZ628n5xiN2jF
- EQOqz9GHSdN4YPDGzbd2QrqkWWSXWcP4TRoFJMvPEnxwgqN4BrCMY52x2koF
- Fj4Lm65pq26I7ErlHpYU4bN5Y2CbYZN5ppWtqalyMX167S8mDTF0vkW.0aqa
- nLNu38OSqRfUqRPPQ7AQn3E14fcFq0pzxHANEVRzXKvEYhPOBu_90NxxamxU
- G.eFig8PQFQIzOZwzN7KreILICiMNeZxRDoJdT5ouFy6t5fdNUYB_ee5byqg
- wQxFpGY1oqjqnF8cKhoqXKbewhXnAHtruHmJctwcDFB6Z8Ky3trGEHXeFKUm
- GDXN6bh1VT2YLVcWEmfzO3F.4zVSYcpsDkJD_a8_ywFNwxs.cXyhZyba4x7Y
- 3X_XjCes4rCDftjcZuVBMiX3KYZNX.oooDLZBmsb3P.j1FQ8XIurzueTrFpE
- O_dhyhgI.hOo8BweGv3a89eFdBCyhU1o7cEGK.mrU1sj3kX6d4FhfHmA8cGv
- n50B5b94d3MpWSnSDFldjz0i2Jun6VUVYuG3yFqtsrf7ZnaTuxswub9SrhbO
- mF02jK6oxTIWYUZEU8vgvciXeiS_YdSmJ1tzbeWJRFeo6ePbTbcZGmY-
-X-Originating-IP: [74.6.131.123]
-Received: from 10.220.180.155  (EHLO sonic311-13.consmr.mail.bf2.yahoo.com) (74.6.131.123)
-  by mta4011.aol.mail.ne1.yahoo.com with SMTPS; Wed, 10 Jun 2020 10:42:32 +0000
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=bounce; t=1591785751; bh=iNhZ8sZ9ZQS8RKoDRTbDsAW/YGN71KVQTVc/Xecb9UQ=; h=Date:From:To:Subject:From:Subject; b=IEjn12+yP0ddLWLojXRLLBx545x7trCIcmMiPuKViBb+UBCAT568e0nmwukVqF6FfeR4hcmWqISlyR22409sOckSZmf0+Fj3rgeaFAmhrl1l4P1uEdNSB4dMH3gcHxAN3DdTyUBQss2ZIyu7xnYJguCadQ1/1ELa865EtJJAkes=
-Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.bf2.yahoo.com with HTTP; Wed, 10 Jun 2020 10:42:31 +0000
-Date: Wed, 10 Jun 2020 10:42:31 +0000
-From: MAILER-DAEMON@yahoo.com
-To: deltachattestac@aol.com
-Message-ID: <1266721401.228154.1591785751559@sonic311.consmr.mail.bf2.yahoo.com>
-Subject: Failure Notice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-Content-Length: 3322
-
-Sorry, we were unable to deliver your message to the following address.
-
-<hsnaeirternaeiho@testrun.org>:
-550: 5.1.1 <hsnaeirternaeiho@testrun.org>: Recipient address rejected: User unknown in virtual mailbox table
-
---- Below this line is a copy of the message.
-
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1591785750; bh=4ktMNgiiY0GHVCUgIv4TvXVESetaS2esyta25tCU5Rg=; h=Date:From:Reply-To:To:Subject:References:From:Subject; b=HLpgexVrsHu1BSnI+l+ob6hCyl2HRO3xPCLRg090QIR1LwMtMbccdjSSi6o17Qx1E/6Y0YHqHgDq+/vGxXZ72GyxHfimpHWYxfjhpgbuXxCbPZkcPejE1kjsR0LHLZ0lmHPuZYbY6pdpROfQC3jOwL616p0vhqZ4QwSTsQhmOBgydA85uIvTWqzjra0GNY5oS8k9CwSmE2N8bRPmEmZzkPytV2RimpEwylCy7IiJ7S6EURnyjxMO5uaZukNjh/XJLxzEEo1ief0EeYfYuq3BPTKHJf7FqV6Dzqu7bIbowVWBTTJ7eFAPUcDwoum5Yz5H63gp5ZFhghV0tDcAjSzOIA==
-X-YMail-OSG: XrOprp8VM1l6O.1AuZ5z4b5aOZ5xPHdr1b50c6CBHbn7lnLF9ZdsolbJdKegkJi
- NAXKKEdjXM4834uHoJ0tQijRGfPO2pZ8Ie0fgORrev_T1z0c9cmt92vSh2eH2CL3wpaY3nJBQqjL
- XxcC3E7cmThUGmPXMCc8O6hYBtGJyyw0lFvegOkgNkIZ.VdHcMyCXoqzrLrTUx1AVI8j_5l7J_iL
- wbrGBndP484r_S04WrvzM_i1yRg.Zl01q5o17SjS2vKn2mlLhZhNtBR1RyM9HmoZcEpOW0QesDHm
- BLYBeag8wczZJBA6xuAVgLTwCkMHRCRqFMfb.22mpfY6HTwOP3EsG5.we8Ywe.7mSIVhfjozg9Bm
- BR3qGGHKD7tJR4X8RFE.tRrnaJS_pUZ1frkJcxEpiau9VFvbTHm5QDltb5gLJUKcj1axNQcPOXF5
- 9lCbo04.yHhjrh.nBk0YmVAYR4.CtpnlgxFdB_ylCqy7cAVukViqvvYBE90PhmT2B8OZBK3LE8De
- jvDIDmkyEe4vu6uE7AAlP.vOi5fFEtkGkGsI46uvUARICijKiIfVA5k7XeN3Ahz0Eil05w.kWPYv
- SgA8r39ZLclSnGTn.bT5lz8toogaE.GeGz_ChdKT5MD9.1VFZVM1ir2RipJO1XPbBXGB2eWtTmje
- WiuXY4ydHo.FusM7VREfyxfo7cUIFlcNwidJGSKYG3YQbj8Gx3ZFDBzW2rOqRhXLWNMbA4owKTiZ
- FtcZTwSiGZvUefyMf0c_FWTLdgz.ZNyuDnMEqdAymAxX9vlTtA7pY8EPPC3TwHFG6Zrk2w_UA7Wv
- mxfZbbCz26O4_1CnByCh1YBbb8ijWLCq3ZjnNcHSwdSZMpuysG3hAd42R.xNHM.W69WS6m0LnwQj
- cnaoTVl6T1Me5EkWX7Z8i75nhIwV1csc74lFgb_.5uDjRKFjmA3KUu5UWDCiWjjWqEeMf6Fsl1nQ
- ltXet3ZdssaDjmXfMncHv4Qz7nmH4z_QYovap4SApHUQjPgPPVZHsofmikIugjtzeXqM4OFN0xjZ
- 0GzjH9W4EqGlWY29nwPOswrB429jvMHA5R.mBTS6mUBmYm924n4v9yJ2TUTOy4Vh.65Ngd8AsGgm
- 75u125bogA5MKHMPGfWpnrys9lCyq3mmhtkkc58R3PYfX0iBXjdP7diVMQhjGgqZMPBbDhDzbECx
- mlgcqfqVGwyOmWmKe0OUFjyMVxYV9DwucWIKA.sd02NWEZhDzoQ3CHkaedi3i3YAePx9jbNnNIuo
- MY.d8jQDDBQxMtPcece79VtoHLAjwKNT5cSzlvpgJHNtVyOpWjOQ-
-Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.bf2.yahoo.com with HTTP; Wed, 10 Jun 2020 10:42:30 +0000
-Date: Wed, 10 Jun 2020 10:42:27 +0000 (UTC)
-From: Delta Chat Test <deltachattestac@aol.com>
-Reply-To: Delta Chat Test <deltachattestac@aol.com>
-To: "hsnaeirternaeiho@testrun.org" <hsnaeirternaeiho@testrun.org>
-Message-ID: <1772450882.1447284.1591785747540@mail.yahoo.com>
-Subject: test
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
-	boundary="----=_Part_1447283_353296880.1591785747539"
-References: <1772450882.1447284.1591785747540.ref@mail.yahoo.com>
-X-Mailer: WebService/1.1.16072 aolwebmail Mozilla/5.0 (X11; Linux x86_64; rv:77.0) Gecko/20100101 Firefox/77.0
-Content-Length: 418
-
-------=_Part_1447283_353296880.1591785747539
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-test
-------=_Part_1447283_353296880.1591785747539
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-
-<div style="color:;font: 10pt Helvetica Neue;">t<font size="2"><font face="Arial, Helvetica, sans-serif">est</font></font></div>
-
-------=_Part_1447283_353296880.1591785747539--