diff --git a/tests/empty/empty.sh b/tests/empty/empty.sh
new file mode 100755
index 00000000..580474f5
--- /dev/null
+++ b/tests/empty/empty.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+# check indexing of an empty directory name
+recollq EmptyUniqueTerm > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/empty/empty.txt b/tests/empty/empty.txt
new file mode 100644
index 00000000..3e65e22b
--- /dev/null
+++ b/tests/empty/empty.txt
@@ -0,0 +1,3 @@
+Recoll query: (emptyuniqueterm:(wqf=11))
+1 results 
+application/x-fsdirectory	[file:///home/dockes/projets/fulltext/testrecoll/emptyUniqueTerm]	[emptyUniqueTerm]	512	bytes	
diff --git a/tests/html/html.sh b/tests/html/html.sh
new file mode 100755
index 00000000..af5bbf99
--- /dev/null
+++ b/tests/html/html.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq QMapConstIterator > $mystdout 2> $mystderr
+recollq Qtextedit Widget Provides Powerful Single-Page >> $mystdout 2>> $mystderr
+recollq '"This is the Mysql reference manual"'  >> $mystdout 2>> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/html/html.txt b/tests/html/html.txt
new file mode 100644
index 00000000..5c622a7e
--- /dev/null
+++ b/tests/html/html.txt
@@ -0,0 +1,9 @@
+Recoll query: (qmapconstiterator:(wqf=11))
+1 results 
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/qtl.html]	[Qt Template Library Classes]	2817	bytes	
+Recoll query: ((qtextedit:(wqf=11) AND widget:(wqf=11) AND provides:(wqf=11) AND powerful:(wqf=11) AND single-page:(wqf=11)))
+1 results 
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/qtextedit.html]	[QTextEdit Class]	108921	bytes	
+Recoll query: ((this PHRASE 6 is PHRASE 6 the PHRASE 6 mysql PHRASE 6 reference PHRASE 6 manual))
+1 results 
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/mysqlmanual.html]	[MySQL 3.23, 4.0, 4.1 Reference Manual]	8136414	bytes	
diff --git a/tests/images/images.sh b/tests/images/images.sh
new file mode 100755
index 00000000..4bac7dac
--- /dev/null
+++ b/tests/images/images.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+# Image names 
+recollq photovoeux > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/images/images.txt b/tests/images/images.txt
new file mode 100644
index 00000000..63da24d8
--- /dev/null
+++ b/tests/images/images.txt
@@ -0,0 +1,3 @@
+Recoll query: (photovoeux:(wqf=11))
+1 results 
+image/jpeg	[file:///home/dockes/projets/fulltext/testrecoll/images/photovoeux.jpg]	[photovoeux.jpg]	136796	bytes	
diff --git a/tests/koi8r/koi8r.sh b/tests/koi8r/koi8r.sh
new file mode 100755
index 00000000..3ccad00a
--- /dev/null
+++ b/tests/koi8r/koi8r.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq 'внешнии' > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/koi8r/koi8r.txt b/tests/koi8r/koi8r.txt
new file mode 100644
index 00000000..c8151a72
--- /dev/null
+++ b/tests/koi8r/koi8r.txt
@@ -0,0 +1,3 @@
+Recoll query: (внешнии:(wqf=11))
+1 results 
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/ru_RU.KOI8-R/zip-drive.html]	[Устройства Zip]	8599	bytes	
diff --git a/tests/lyx/lyx.txt b/tests/lyx/lyx.txt
index be705a0f..47a61c86 100644
--- a/tests/lyx/lyx.txt
+++ b/tests/lyx/lyx.txt
@@ -2,9 +2,8 @@ Recoll query: ((bienvenue:(wqf=11) AND dans:(wqf=11) AND univers:(wqf=11) AND de
 1 results 
 application/x-lyx	[file:///home/dockes/projets/fulltext/testrecoll/lyx/fr_splash.lyx]	[fr_splash.lyx]	3577	bytes	
 Recoll query: ((welcome:(wqf=11) AND to:(wqf=11) AND lyx:(wqf=11)))
-2 results 
+1 results 
 application/x-lyx	[file:///home/dockes/projets/fulltext/testrecoll/lyx/splash.lyx]	[splash.lyx]	2974	bytes	
-text/plain	[file:///home/dockes/projets/fulltext/testrecoll/filenames/filenames.txt]	[filenames.txt]	8617039	bytes	
 Recoll query: ((udvozli:(wqf=11) AND ont:(wqf=11) AND a:(wqf=11) AND lyx:(wqf=11)))
 1 results 
 application/x-lyx	[file:///home/dockes/projets/fulltext/testrecoll/lyx/hu_splash.lyx]	[hu_splash.lyx]	4773	bytes	
diff --git a/tests/mail/mail.sh b/tests/mail/mail.sh
new file mode 100755
index 00000000..ed6115be
--- /dev/null
+++ b/tests/mail/mail.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq Outmail_uniqueTerm          > $mystdout 2> $mystderr
+recollq '"St Pierre en Chartreuse"' >> $mystdout 2>> $mystderr
+recollq HtmlAttachment_uniqueTerm   >> $mystdout 2>> $mystderr
+recollq '"Dear Corporate Administrator"' >> $mystdout 2>> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/mail/mail.txt b/tests/mail/mail.txt
new file mode 100644
index 00000000..f2d95f9f
--- /dev/null
+++ b/tests/mail/mail.txt
@@ -0,0 +1,13 @@
+Recoll query: (outmail_uniqueterm:(wqf=11))
+2 results 
+message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/mail/outmail]	[Re: CDNow, mkfichcom.tcl and "]	2248233	bytes	
+message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/mail/outmail]	[Home Ip]	2248233	bytes	
+Recoll query: ((st PHRASE 4 pierre PHRASE 4 en PHRASE 4 chartreuse))
+1 results 
+message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/mail/BadHtmlInMail]	[Prochaine rando]	3637	bytes	
+Recoll query: (htmlattachment_uniqueterm:(wqf=11))
+1 results 
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/mail/attach]	[RECOLL: a personal text search system for Unix/Linux]	4870	bytes	
+Recoll query: ((dear PHRASE 3 corporate PHRASE 3 administrator))
+1 results 
+message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/mail/badMail.edit]	[none - In payments / Out payments]	855	bytes	
diff --git a/tests/notypes/notypes.sh b/tests/notypes/notypes.sh
new file mode 100755
index 00000000..e11c6000
--- /dev/null
+++ b/tests/notypes/notypes.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq Enerve_uniqueTerm          > $mystdout 2> $mystderr
+recollq notype1_uniqueterm >> $mystdout 2>> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/notypes/notypes.txt b/tests/notypes/notypes.txt
new file mode 100644
index 00000000..fcd7dc09
--- /dev/null
+++ b/tests/notypes/notypes.txt
@@ -0,0 +1,6 @@
+Recoll query: (enerve_uniqueterm:(wqf=11))
+1 results 
+application/x-empty	[file:///home/dockes/projets/fulltext/testrecoll/notypes/�nerv�_uniqueTerm.xfy]	[énervé_uniqueTerm.xfy]	0	bytes	
+Recoll query: (notype1_uniqueterm:(wqf=11))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/notypes/notype1.xfx]	[notype1.xfx]	64	bytes	
diff --git a/tests/rfc2231/rfc2231.sh b/tests/rfc2231/rfc2231.sh
new file mode 100755
index 00000000..8da28734
--- /dev/null
+++ b/tests/rfc2231/rfc2231.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+# These one are name/filenamefor an inline part, no result
+recollq EnerveUniqueNameTerm > $mystdout 2> $mystderr
+recollq EnerveUniqueFileNameTerm >> $mystdout 2>> $mystderr
+# This one for actual attachment
+recollq EpatantUniquenameterm      >> $mystdout 2>> $mystderr
+recollq EpatantUniquefilenameterm      >> $mystdout 2>> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/rfc2231/rfc2231.txt b/tests/rfc2231/rfc2231.txt
new file mode 100644
index 00000000..a1488238
--- /dev/null
+++ b/tests/rfc2231/rfc2231.txt
@@ -0,0 +1,10 @@
+Recoll query: (enerveuniquenameterm:(wqf=11))
+0 results 
+Recoll query: (enerveuniquefilenameterm:(wqf=11))
+0 results 
+Recoll query: (epatantuniquenameterm:(wqf=11))
+0 results 
+Recoll query: (epatantuniquefilenameterm:(wqf=11))
+2 results 
+application/octet-stream	[file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder]	[épatantuniquefilenameterm.bin]	42579	bytes	
+message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder]	[vrai attach]	42579	bytes	
diff --git a/tests/special/special.sh b/tests/special/special.sh
new file mode 100755
index 00000000..cbd6e4a5
--- /dev/null
+++ b/tests/special/special.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq uppercase_uniqueterm  > $mystdout 2> $mystderr
+# The term is the lowercase utf8 version of the term in casefolding.txt
+recollq 'àstrangewordþ'         >> $mystdout 2>> $mystderr
+recollq '"Modernite/efficience/pertinence"' >> $mystdout 2>> $mystderr
+recollq  dom.popup_allowed_events    >> $mystdout 2>> $mystderr
+recollq  toto@jean-23.fr   >> $mystdout 2>> $mystderr
+
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/special/special.txt b/tests/special/special.txt
new file mode 100644
index 00000000..b7047e69
--- /dev/null
+++ b/tests/special/special.txt
@@ -0,0 +1,15 @@
+Recoll query: (uppercase_uniqueterm:(wqf=11))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/UPPERCASE_uniqueTERM.txt]	[UPPERCASE_uniqueTERM.txt]	1	bytes	
+Recoll query: (astrangewordþ:(wqf=11))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/casefolding.txt]	[casefolding.txt]	59	bytes	
+Recoll query: ((modernite PHRASE 3 efficience PHRASE 3 pertinence))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/di li gence.txt]	[di li gence.txt]	6216	bytes	
+Recoll query: ((dom.popup_allowed_events:(wqf=11) OR dom.popup_allowed_ev))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/strangewords.txt]	[strangewords.txt]	41	bytes	
+Recoll query: ((toto PHRASE 4 jean PHRASE 4 23 PHRASE 4 fr))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/strangewords.txt]	[strangewords.txt]	41	bytes	
diff --git a/tests/txt/txt.sh b/tests/txt/txt.sh
new file mode 100755
index 00000000..474afcec
--- /dev/null
+++ b/tests/txt/txt.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+# Should find the file where its unaccented and the other
+recollq Anemometre > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/txt/txt.txt b/tests/txt/txt.txt
new file mode 100644
index 00000000..6d012c61
--- /dev/null
+++ b/tests/txt/txt.txt
@@ -0,0 +1,4 @@
+Recoll query: (anemometre:(wqf=11))
+2 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/txt/liste.txt]	[liste.txt]	1165	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/txt/liste1.txt]	[liste1.txt]	893	bytes	
diff --git a/tests/utf8/utf8.sh b/tests/utf8/utf8.sh
new file mode 100755
index 00000000..0cdfa42b
--- /dev/null
+++ b/tests/utf8/utf8.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq "etonne precite" > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/utf8/utf8.txt b/tests/utf8/utf8.txt
new file mode 100644
index 00000000..96045371
--- /dev/null
+++ b/tests/utf8/utf8.txt
@@ -0,0 +1,3 @@
+Recoll query: (((etonnant OR etonne:(wqf=11) OR etonnement OR etonnes OR etonn) AND (precite:(wqf=11) OR precit)))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/utf8/frenchUtf.txt]	[frenchUtf.txt]	87	bytes