diff --git a/tests/Maildir1/Maildir1.txt b/tests/Maildir1/Maildir1.txt
index afcc8fcd..41bb20f9 100644
--- a/tests/Maildir1/Maildir1.txt
+++ b/tests/Maildir1/Maildir1.txt
@@ -1,3 +1,3 @@
 Recoll query: ((emi PHRASE 6 is PHRASE 6 releasing PHRASE 6 albums PHRASE 6 for PHRASE 6 download))
 1 results 
-100%	text/html		10825	bytes	[file:///home/dockes/projets/fulltext/testrecoll/Maildir/a.tager/cur/1134632779.000001.mbox:2,S]	[00/05/05 - Mix&Match Meeting in the Zydeco room]
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/Maildir/a.tager/cur/1134632779.000001.mbox:2,S]	[00/05/05 - Mix&Match Meeting in the Zydeco room]	10825	bytes	
diff --git a/tests/andor/andor.txt b/tests/andor/andor.txt
index 500ff7ed..bdc9bf95 100644
--- a/tests/andor/andor.txt
+++ b/tests/andor/andor.txt
@@ -1,4 +1,4 @@
 Recoll query: (((beatles:(wqf=11) OR lennon:(wqf=11)) AND (live:(wqf=11) OR unplugged:(wqf=11))))
 2 results 
-53%	text/plain		18	bytes	[file:///home/dockes/projets/fulltext/testrecoll/andor/bu.txt]	[bu.txt]
-46%	text/plain		12	bytes	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/bu.txt]	[bu.txt]	18	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	12	bytes	
diff --git a/tests/badsuffs1/badsuffs1.txt b/tests/badsuffs1/badsuffs1.txt
index 971f5018..aa204207 100644
--- a/tests/badsuffs1/badsuffs1.txt
+++ b/tests/badsuffs1/badsuffs1.txt
@@ -1,8 +1,8 @@
 Recoll query: (badsufffilename:(wqf=11))
 6 results 
-99%			19	bytes	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tgz]	[badsufffilename.tgz]
-99%			19	bytes	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.bz2]	[badsufffilename.tar.bz2]
-99%			19	bytes	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.log.gz]	[badsufffilename.log.gz]
-99%			19	bytes	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5]	[badsufffilename.md5]
-99%			19	bytes	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.gz]	[badsufffilename.tar.gz]
-99%			19	bytes	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz]	[badsufffilename.tbz]
+	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tgz]	[badsufffilename.tgz]	19	bytes	
+	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.bz2]	[badsufffilename.tar.bz2]	19	bytes	
+	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.log.gz]	[badsufffilename.log.gz]	19	bytes	
+	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5]	[badsufffilename.md5]	19	bytes	
+	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.gz]	[badsufffilename.tar.gz]	19	bytes	
+	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz]	[badsufffilename.tbz]	19	bytes	
diff --git a/tests/boolean/boolean.sh b/tests/boolean/boolean.sh
new file mode 100755
index 00000000..6f53c6e7
--- /dev/null
+++ b/tests/boolean/boolean.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq 'boolean_uniqueterm One or Two -Three' > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/boolean/boolean.txt b/tests/boolean/boolean.txt
new file mode 100644
index 00000000..a2c8db73
--- /dev/null
+++ b/tests/boolean/boolean.txt
@@ -0,0 +1,5 @@
+Recoll query: (((boolean_uniqueterm:(wqf=11) AND (one:(wqf=11) OR two:(wqf=11))) AND_NOT three:(wqf=11)))
+3 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/boolean/12.txt]	[12.txt]	27	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/boolean/2.txt]	[2.txt]	23	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/boolean/1.txt]	[1.txt]	23	bytes	
diff --git a/tests/delete/delete.sh b/tests/delete/delete.sh
new file mode 100755
index 00000000..3cae7f01
--- /dev/null
+++ b/tests/delete/delete.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+tstfile=${tstdata}/delete/tobedeleted.txt
+
+# Create file to be deleted, index, query
+echo "DeletedFileUnique" > $tstfile
+recollindex >> $mystderr 2>&1 
+recollq DeletedFileUnique > $mystdout 2> $mystderr
+
+# Delete file and query again
+rm -f ${tstdata}/delete/tobedeleted.txt
+recollindex  >> $mystderr 2>&1 
+recollq DeletedFileUnique >> $mystdout 2>> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/delete/delete.txt b/tests/delete/delete.txt
new file mode 100644
index 00000000..121a973e
--- /dev/null
+++ b/tests/delete/delete.txt
@@ -0,0 +1,5 @@
+Recoll query: (deletedfileunique:(wqf=11))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/delete/tobedeleted.txt]	[tobedeleted.txt]	18	bytes	
+Recoll query: (deletedfileunique:(wqf=11))
+0 results 
diff --git a/tests/dirwithblanks/dirwithblanks.sh b/tests/dirwithblanks/dirwithblanks.sh
new file mode 100755
index 00000000..59bf5101
--- /dev/null
+++ b/tests/dirwithblanks/dirwithblanks.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq DirWithBlanksUnique > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/dirwithblanks/dirwithblanks.txt b/tests/dirwithblanks/dirwithblanks.txt
new file mode 100644
index 00000000..a5958346
--- /dev/null
+++ b/tests/dirwithblanks/dirwithblanks.txt
@@ -0,0 +1,3 @@
+Recoll query: (dirwithblanksunique:(wqf=11))
+1 results 
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/dir with blanks/dwb.txt]	[dwb.txt]	20	bytes	
diff --git a/tests/djvu/djvu.sh b/tests/djvu/djvu.sh
new file mode 100755
index 00000000..45cec3dc
--- /dev/null
+++ b/tests/djvu/djvu.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq aharonov algorithm neural> $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/djvu/djvu.txt b/tests/djvu/djvu.txt
new file mode 100644
index 00000000..4e0a31a7
--- /dev/null
+++ b/tests/djvu/djvu.txt
@@ -0,0 +1,3 @@
+Recoll query: ((aharonov:(wqf=11) AND (algorithm:(wqf=11) OR algorithms OR algorithmic OR algorithme) AND neural:(wqf=11)))
+1 results 
+image/vnd.djvu	[file:///home/dockes/projets/fulltext/testrecoll/djvu/Aharonov-BarkiMeilijsonRuppin.djvu]	[Who Does What? A Novel Algorithm to Determine Function Localization]	74911	bytes	
diff --git a/tests/dvi/dvi.sh b/tests/dvi/dvi.sh
new file mode 100755
index 00000000..219794ab
--- /dev/null
+++ b/tests/dvi/dvi.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq 'krisrose' > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/dvi/dvi.txt b/tests/dvi/dvi.txt
new file mode 100644
index 00000000..4db38585
--- /dev/null
+++ b/tests/dvi/dvi.txt
@@ -0,0 +1,3 @@
+Recoll query: ((krisrose:(wqf=11) OR krisros))
+1 results 
+application/x-dvi	[file:///home/dockes/projets/fulltext/testrecoll/dvi/xyguide.dvi]	[xyguide.dvi]	313720	bytes	
diff --git a/tests/lyx/lyx.sh b/tests/lyx/lyx.sh
new file mode 100755
index 00000000..c3fff9d1
--- /dev/null
+++ b/tests/lyx/lyx.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq 'Bienvenue Dans Univers De Lyx' > $mystdout 2> $mystderr
+recollq 'Welcome To Lyx' >> $mystdout 2>> $mystderr
+recollq 'Udvozli Ont A LyX' >> $mystdout 2>> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/lyx/lyx.txt b/tests/lyx/lyx.txt
new file mode 100644
index 00000000..be705a0f
--- /dev/null
+++ b/tests/lyx/lyx.txt
@@ -0,0 +1,10 @@
+Recoll query: ((bienvenue:(wqf=11) AND dans:(wqf=11) AND univers:(wqf=11) AND de:(wqf=11) AND lyx:(wqf=11)))
+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 
+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/media/media.sh b/tests/media/media.sh
new file mode 100755
index 00000000..a2a65348
--- /dev/null
+++ b/tests/media/media.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq Maldon > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/media/media.txt b/tests/media/media.txt
new file mode 100644
index 00000000..572297a3
--- /dev/null
+++ b/tests/media/media.txt
@@ -0,0 +1,3 @@
+Recoll query: (maldon:(wqf=11))
+1 results 
+audio/mpeg	[file:///home/dockes/projets/fulltext/testrecoll/media/11-maldon.mp3]	[11-maldon.mp3]	5717570	bytes	
diff --git a/tests/msword/msword.sh b/tests/msword/msword.sh
new file mode 100755
index 00000000..78ad3b57
--- /dev/null
+++ b/tests/msword/msword.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq '"Evenements et programme 2006"' > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/msword/msword.txt b/tests/msword/msword.txt
new file mode 100644
index 00000000..f1f9c3ce
--- /dev/null
+++ b/tests/msword/msword.txt
@@ -0,0 +1,3 @@
+Recoll query: ((evenements PHRASE 4 et PHRASE 4 programme PHRASE 4 2006))
+1 results 
+application/msword	[file:///home/dockes/projets/fulltext/testrecoll/msword/programme.doc]	[programme.doc]	58880	bytes	
diff --git a/tests/ooff/ooff.sh b/tests/ooff/ooff.sh
new file mode 100755
index 00000000..b9377ff3
--- /dev/null
+++ b/tests/ooff/ooff.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq OpenofficeWriter_uniqueterm > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/ooff/ooff.txt b/tests/ooff/ooff.txt
new file mode 100644
index 00000000..be412008
--- /dev/null
+++ b/tests/ooff/ooff.txt
@@ -0,0 +1,3 @@
+Recoll query: (openofficewriter_uniqueterm:(wqf=11))
+1 results 
+application/vnd.sun.xml.writer	[file:///home/dockes/projets/fulltext/testrecoll/ooff/writer.odt]	[writer.odt]	6360	bytes	
diff --git a/tests/pdf/pdf.sh b/tests/pdf/pdf.sh
new file mode 100755
index 00000000..e71d32c9
--- /dev/null
+++ b/tests/pdf/pdf.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq '"sequences of moveto and lineto"' OR 'ANSIX3.4' > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/pdf/pdf.txt b/tests/pdf/pdf.txt
new file mode 100644
index 00000000..c1dc1696
--- /dev/null
+++ b/tests/pdf/pdf.txt
@@ -0,0 +1,4 @@
+Recoll query: (((sequences PHRASE 5 of PHRASE 5 moveto PHRASE 5 and PHRASE 5 lineto) OR ansix3.4:(wqf=11)))
+2 results 
+application/pdf	[file:///home/dockes/projets/fulltext/testrecoll/pdf/ThinkingInPostScript.pdf]	[Thinking In PostScript]	846435	bytes	
+application/pdf	[file:///home/dockes/projets/fulltext/testrecoll/pdf/linux unicode.pdf]	[developerWorks: Linux | Unicode : Linux Unicode programming]	72669	bytes	
diff --git a/tests/postscript/postscript.sh b/tests/postscript/postscript.sh
new file mode 100755
index 00000000..377eb301
--- /dev/null
+++ b/tests/postscript/postscript.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq '"Udi Manber and Sun Wu"' > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/postscript/postscript.txt b/tests/postscript/postscript.txt
new file mode 100644
index 00000000..3ad80576
--- /dev/null
+++ b/tests/postscript/postscript.txt
@@ -0,0 +1,3 @@
+Recoll query: ((udi PHRASE 5 manber PHRASE 5 and PHRASE 5 sun PHRASE 5 wu))
+1 results 
+application/postscript	[file:///home/dockes/projets/fulltext/testrecoll/postscript/glimpse.ps]	[glimpse.ps]	118970	bytes	
diff --git a/tests/ppt/ppt.sh b/tests/ppt/ppt.sh
new file mode 100755
index 00000000..bf3d5b06
--- /dev/null
+++ b/tests/ppt/ppt.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq '"plurilingues et pluriculturels"' > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/ppt/ppt.txt b/tests/ppt/ppt.txt
new file mode 100644
index 00000000..8900f156
--- /dev/null
+++ b/tests/ppt/ppt.txt
@@ -0,0 +1,3 @@
+Recoll query: ((plurilingues PHRASE 3 et PHRASE 3 pluriculturels))
+1 results 
+application/vnd.ms-powerpoint	[file:///home/dockes/projets/fulltext/testrecoll/ppt/portfolio.ppt]	[portfolio.ppt]	86016	bytes	
diff --git a/tests/rtf/rtf.sh b/tests/rtf/rtf.sh
new file mode 100755
index 00000000..9b8562e0
--- /dev/null
+++ b/tests/rtf/rtf.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq EQUK0401319A > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/rtf/rtf.txt b/tests/rtf/rtf.txt
new file mode 100644
index 00000000..e62bcd62
--- /dev/null
+++ b/tests/rtf/rtf.txt
@@ -0,0 +1,3 @@
+Recoll query: (equk0401319a:(wqf=11))
+1 results 
+text/rtf	[file:///home/dockes/projets/fulltext/testrecoll/rtf/JO28102004plaisance.rtf]	[J]	117216	bytes	
diff --git a/tests/scribus/scribus.sh b/tests/scribus/scribus.sh
new file mode 100755
index 00000000..430b613c
--- /dev/null
+++ b/tests/scribus/scribus.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq Scribus_sla_uniqueterm OR Chaturbhuja > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/scribus/scribus.txt b/tests/scribus/scribus.txt
new file mode 100644
index 00000000..ff730b11
--- /dev/null
+++ b/tests/scribus/scribus.txt
@@ -0,0 +1,4 @@
+Recoll query: ((scribus_sla_uniqueterm:(wqf=11) OR chaturbhuja:(wqf=11)))
+2 results 
+application/x-scribus	[file:///home/dockes/projets/fulltext/testrecoll/scribus/Document-1.sla]	[Ceci est le titre du document]	53847	bytes	
+application/x-scribus	[file:///home/dockes/projets/fulltext/testrecoll/scribus/Prova_Scribus-1.scd]	[Prova_Scribus-1.scd]	34995	bytes	
diff --git a/tests/shared.sh b/tests/shared.sh
index bdb4a3fe..ee13b77d 100644
--- a/tests/shared.sh
+++ b/tests/shared.sh
@@ -1,4 +1,4 @@
-# @(#$Id: shared.sh,v 1.1 2007-02-14 08:16:47 dockes Exp $  (C) 2006 J.F.Dockes
+# @(#$Id: shared.sh,v 1.2 2007-02-14 11:52:28 dockes Exp $  (C) 2006 J.F.Dockes
 
 # shared code and variables for all tests
 
@@ -7,6 +7,7 @@ export RECOLL_CONFDIR
 
 # Call this with the script's $0 as argument
 initvariables() {
+  tstdata=/home/dockes/projets/fulltext/testrecoll		
   toptmp=${TMPDIR:-/tmp}/recolltsttmp
   myname=`basename $1 .sh`
   mystderr=$toptmp/${myname}.err
diff --git a/tests/skipped/skipped.sh b/tests/skipped/skipped.sh
index 166fe8ec..18418379 100755
--- a/tests/skipped/skipped.sh
+++ b/tests/skipped/skipped.sh
@@ -5,7 +5,7 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq shouldbeSkippedUnique > $mystdout 2> $mystderr
+recollq ShouldbeSkippedUnique > $mystdout 2> $mystderr
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/skipped/skipped.txt b/tests/skipped/skipped.txt
index 8cc6ea2f..31be0574 100644
--- a/tests/skipped/skipped.txt
+++ b/tests/skipped/skipped.txt
@@ -1,3 +1,3 @@
-Recoll query: ((shouldbeskippedunique:(wqf=11) OR shouldbeskippeduniqu))
+Recoll query: (shouldbeskippedunique:(wqf=11))
 1 results 
-61%	text/plain		48	bytes	[file:///home/dockes/projets/fulltext/testrecoll/skipped/rlyskipped/shouldnotbeskipped.txt]	[shouldnotbeskipped.txt]
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/skipped/rlyskipped/shouldnotbeskipped.txt]	[shouldnotbeskipped.txt]	48	bytes	
diff --git a/tests/xls/xls.sh b/tests/xls/xls.sh
new file mode 100755
index 00000000..28d8a66a
--- /dev/null
+++ b/tests/xls/xls.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq Excel_UniqueTerm > $mystdout 2> $mystderr
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/xls/xls.txt b/tests/xls/xls.txt
new file mode 100644
index 00000000..3cf85312
--- /dev/null
+++ b/tests/xls/xls.txt
@@ -0,0 +1,3 @@
+Recoll query: (excel_uniqueterm:(wqf=11))
+1 results 
+application/vnd.ms-excel	[file:///home/dockes/projets/fulltext/testrecoll/xls/landis1.xls]	[landis1.xls]	8704	bytes