diff --git a/autotests/integration/filesearchstoretest.cpp b/autotests/integration/filesearchstoretest.cpp
index fcbe4509..fdebf1bd 100644
--- a/autotests/integration/filesearchstoretest.cpp
+++ b/autotests/integration/filesearchstoretest.cpp
@@ -1,426 +1,426 @@
 /*
  * This file is part of the KDE Baloo Project
  * Copyright (C) 2013  Vishesh Handa <me@vhanda.in>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) version 3, or any
  * later version accepted by the membership of KDE e.V. (or its
  * successor approved by the membership of KDE e.V.), which shall
  * act as a proxy defined in Section 6 of version 3 of the license.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 #include "filesearchstoretest.h"
 #include "filesearchstore.h"
 #include "../../file/database.h"
 #include "filemapping.h"
 #include "query.h"
 #include "term.h"
 
-#include <QtTest>
+#include <QTest>
 
 #include <xapian.h>
 #include <kfilemetadata/properties.h>
 #include <kfilemetadata/propertyinfo.h>
 
 
 using namespace Baloo;
 
 void FileSearchStoreTest::testSimpleSearchString()
 {
     QBENCHMARK {
         QString url1(QLatin1String("/home/t/a"));
         quint64 id1 = insertUrl(url1);
         insertText(id1, QLatin1String("This is sample text"));
 
         QString url2(QLatin1String("/home/t/b"));
         quint64 id2 = insertUrl(url2);
         insertText(id2, QLatin1String("sample sample more sample text"));
 
         Query q;
         q.addType(QLatin1String("File"));
         q.setSearchString(QLatin1String("Sample"));
 
         int qid = m_store->exec(q);
         //QCOMPARE(qid, 1);
         QVERIFY(m_store->next(qid));
         QCOMPARE(m_store->id(qid), serialize("file", id2));
         QCOMPARE(m_store->filePath(qid), url2);
 
         QVERIFY(m_store->next(qid));
         QCOMPARE(m_store->id(qid), serialize("file", id1));
         QCOMPARE(m_store->filePath(qid), url1);
 
         QVERIFY(!m_store->next(qid));
         QVERIFY(m_store->id(qid).isEmpty());
         QVERIFY(m_store->filePath(qid).isEmpty());
 
         m_store->close(qid);
         cleanupTestCase();
         init();
     }
 }
 
 void FileSearchStoreTest::testPropertyValueEqual()
 {
     QString url1(QLatin1String("/home/t/a"));
     quint64 id1 = insertUrl(url1);
     insertText(id1, QLatin1String("This is sample text"));
 
     QString url2(QLatin1String("/home/t/b"));
     quint64 id2 = insertUrl(url2);
     insertText(id2, QLatin1String("sample sample more sample but not text"));
 
     Query q;
     q.setTerm(Term(QString(), "Sample text", Baloo::Term::Equal));
     q.addType(QLatin1String("File"));
 
     int qid = m_store->exec(q);
     QCOMPARE(qid, 1);
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", id1));
     QCOMPARE(m_store->filePath(qid), url1);
 
     QVERIFY(!m_store->next(qid));
     QVERIFY(m_store->id(qid).isEmpty());
     QVERIFY(m_store->filePath(qid).isEmpty());
 
     m_store->close(qid);
 }
 
 void FileSearchStoreTest::testIncludeDir()
 {
     QString url1(QLatin1String("/home/t/a"));
     quint64 id1 = insertUrl(url1);
     insertText(id1, QLatin1String("This is sample text"));
 
     QString url2(QLatin1String("/home/t/b"));
     quint64 id2 = insertUrl(url2);
     insertText(id2, QLatin1String("sample sample more sample text"));
 
     QString url3(QLatin1String("/home/garden/b"));
     quint64 id3 = insertUrl(url3);
     insertText(id3, QLatin1String("The grass is green in the garden."));
 
     QString url4(QLatin1String("/home/tt/b"));
     quint64 id4 = insertUrl(url4);
     insertText(id4, QLatin1String("Let's see if this works."));
 
     QString url5(QLatin1String("/home/t/c"));
     quint64 id5 = insertUrl(url5);
     insertText(id5, QLatin1String("sample sample more sample text"));
 
     Query q;
     q.addType(QLatin1String("File"));
     q.setIncludeFolder(QStringLiteral("/home/t"));
 
     int qid = m_store->exec(q);
     QCOMPARE(qid, 1);
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", id1));
     QCOMPARE(m_store->filePath(qid), url1);
 
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", id2));
     QCOMPARE(m_store->filePath(qid), url2);
 
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", id5));
     QCOMPARE(m_store->filePath(qid), url5);
 
     QVERIFY(!m_store->next(qid));
     QVERIFY(m_store->id(qid).isEmpty());
     QVERIFY(m_store->filePath(qid).isEmpty());
 
     m_store->close(qid);
 }
 
 void FileSearchStoreTest::testRatings()
 {
     QString url1(QLatin1String("/home/t/a"));
     quint64 id1 = insertUrl(url1);
     insertRating(id1, 2);
 
     QString url2(QLatin1String("/home/t/b"));
     quint64 id2 = insertUrl(url2);
     insertRating(id2, 4);
 
     QString url3(QLatin1String("/home/garden/b"));
     quint64 id3 = insertUrl(url3);
     insertRating(id3, 6);
 
     QString url4(QLatin1String("/home/tt/b"));
     quint64 id4 = insertUrl(url4);
     insertRating(id4, 10);
 
     QString url5(QLatin1String("/home/tt/c"));
     quint64 id5 = insertUrl(url5);
     insertText(id5, QLatin1String("Test text"));
 
     //
     // Less than 5
     //
     Query q;
     q.addType(QLatin1String("File"));
     q.setTerm(Term(QLatin1String("rating"), 5, Term::Less));
 
     int qid1 = m_store->exec(q);
     QCOMPARE(qid1, 1);
 
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id1));
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id2));
     QVERIFY(!m_store->next(qid1));
 
     //
     // Greater than 6
     //
     q.setTerm(Term(QLatin1String("rating"), 6, Term::Greater));
 
     int qid2 = m_store->exec(q);
     QCOMPARE(qid2, 2);
 
     QVERIFY(m_store->next(qid2));
     QCOMPARE(m_store->id(qid2), serialize("file", id4));
     QVERIFY(!m_store->next(qid2));
 }
 
 void FileSearchStoreTest::testEmptySearchString()
 {
     QString url1(QLatin1String("/home/t/a"));
     quint64 id1 = insertUrl(url1);
     insertText(id1, QLatin1String("File A"));
 
     QString url2(QLatin1String("/home/t/b"));
     quint64 id2 = insertUrl(url2);
     insertText(id2, QLatin1String("File B"));
 
     QString url3(QLatin1String("/home/garden/b"));
     quint64 id3 = insertUrl(url3);
     insertText(id3, QLatin1String("Garden B"));
 
     QString url4(QLatin1String("/home/tt/b"));
     quint64 id4 = insertUrl(url4);
     insertText(id4, QLatin1String("TT B"));
 
     QString url5(QLatin1String("/home/tt/c"));
     quint64 id5 = insertUrl(url5);
     insertText(id5, QLatin1String("TT C"));
 
     Query q;
     q.addType(QLatin1String("File"));
 
     int qid1 = m_store->exec(q);
     QCOMPARE(qid1, 1);
 
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id1));
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id2));
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id3));
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id4));
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id5));
     QVERIFY(!m_store->next(qid1));
 }
 
 void FileSearchStoreTest::testAllVideos()
 {
     QString url1(QLatin1String("/home/t/a"));
     quint64 id1 = insertUrl(url1);
     insertType(id1, QLatin1String("Video"));
 
     QString url2(QLatin1String("/home/t/b"));
     quint64 id2 = insertUrl(url2);
     insertType(id2, QLatin1String("Image"));
 
     QString url3(QLatin1String("/home/garden/b"));
     quint64 id3 = insertUrl(url3);
     insertType(id3, QLatin1String("Video"));
 
     Query q;
     q.addType(QLatin1String("Video"));
 
     int qid1 = m_store->exec(q);
     QCOMPARE(qid1, 1);
 
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id1));
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id3));
     QVERIFY(!m_store->next(qid1));
 }
 
 void FileSearchStoreTest::testFileNameSearch()
 {
     QString url1(QLatin1String("/home/t/a"));
     quint64 id1 = insertUrl(url1);
     insertExactText(id1, QLatin1String("flowering"), "F");
     insertExactText(id1, QLatin1String("dork"), "F");
     insertExactText(id1, QLatin1String("dork"), "A");
     insertExactText(id1, QLatin1String("dork"), "G");
 
     QString url2(QLatin1String("/home/t/b"));
     quint64 id2 = insertUrl(url2);
     insertExactText(id2, QLatin1String("powering"), "F");
     insertExactText(id2, QLatin1String("fire"), "F");
     insertExactText(id2, QLatin1String("dork"), "A");
     insertExactText(id2, QLatin1String("dork"), "G");
 
     QString url3(QLatin1String("/home/garden/b"));
     quint64 id3 = insertUrl(url3);
     insertExactText(id3, QLatin1String("does"), "F");
     insertExactText(id3, QLatin1String("not"), "F");
     insertExactText(id3, QLatin1String("dork"), "A");
     insertExactText(id3, QLatin1String("dork"), "G");
 
     Query q;
     q.addType(QLatin1String("File"));
     q.setTerm(Term("filename", "dork"));
 
     int qid1 = m_store->exec(q);
     QCOMPARE(qid1, 1);
     QVERIFY(m_store->next(qid1));
     QCOMPARE(m_store->id(qid1), serialize("file", id1));
     QVERIFY(!m_store->next(qid1));
 
     q.setTerm(Term("filename", "do*"));
 
     int qid2 = m_store->exec(q);
     QCOMPARE(qid2, 2);
     QVERIFY(m_store->next(qid2));
     QCOMPARE(m_store->id(qid2), serialize("file", id1));
     QVERIFY(m_store->next(qid2));
     QCOMPARE(m_store->id(qid2), serialize("file", id3));
     QVERIFY(!m_store->next(qid2));
 
     q.setTerm(Term("filename", "*ing"));
 
     int qid3 = m_store->exec(q);
     QCOMPARE(qid3, 3);
     QVERIFY(m_store->next(qid3));
     QCOMPARE(m_store->id(qid3), serialize("file", id1));
     QVERIFY(m_store->next(qid3));
     QCOMPARE(m_store->id(qid3), serialize("file", id2));
     QVERIFY(!m_store->next(qid3));
 
     // Exact match
     q.setTerm(Term("filename", "dork", Term::Equal));
 
     int qid4 = m_store->exec(q);
     QCOMPARE(qid4, 4);
     QVERIFY(m_store->next(qid4));
     QCOMPARE(m_store->id(qid4), serialize("file", id1));
     QVERIFY(!m_store->next(qid4));
 }
 
 void FileSearchStoreTest::testSortingNone()
 {
     insertText(1, QLatin1String("Power A"));
     insertText(2, QLatin1String("Power Power B"));
 
     Query q;
     q.addType(QLatin1String("File"));
     q.setSearchString("Power");
 
     int qid;
 
     // Auto sort - Based on frequency
     qid = m_store->exec(q);
     QCOMPARE(qid, 1);
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", 2));
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", 1));
     QVERIFY(!m_store->next(qid));
 
     // no sort
     q.setSortingOption(Query::SortNone);
 
     qid = m_store->exec(q);
     QCOMPARE(qid, 2);
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", 1));
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", 2));
     QVERIFY(!m_store->next(qid));
 }
 
 void FileSearchStoreTest::testInvalidProperties()
 {
     Query q;
     q.addType(QLatin1String("File"));
     q.setTerm(Term("NoNExistingProperty", QVariant(1)));
 
     int qid = m_store->exec(q);
     QCOMPARE(qid, 0);
     QVERIFY(!m_store->next(qid));
 }
 
 void FileSearchStoreTest::testModifiedProperty()
 {
     QDateTime dt(QDate(2013, 12, 02), QTime(12, 2, 2));
     insertExactText(1, dt.toString(Qt::ISODate), "DT_M");
     insertExactText(2, QDateTime::currentDateTime().toString(Qt::ISODate), "DT_M");
 
     Query q;
     q.addType(QLatin1String("File"));
     q.setTerm(Term(("modified"), dt.date(), Term::Equal));
 
     int qid = m_store->exec(q);
 
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", 1));
     QVERIFY(!m_store->next(qid));
 
     q.setTerm(Term(("modified"), dt, Term::Equal));
 
     qid = m_store->exec(q);
 
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", 1));
     QVERIFY(!m_store->next(qid));
 }
 
 void FileSearchStoreTest::testDateTimeProperty()
 {
     KFileMetaData::PropertyInfo propInfo(KFileMetaData::Property::CreationDate);
     QString prefix = "X" + QString::number((int)propInfo.property());
 
     QDateTime dt(QDate(2013, 12, 02), QTime(12, 2, 2));
     insertExactText(1, dt.toString(Qt::ISODate), prefix);
     insertExactText(2, QDateTime::currentDateTime().toString(Qt::ISODate), prefix);
 
     Query q;
     q.addType(QLatin1String("File"));
     q.setTerm(Term(propInfo.name(), dt.date(), Term::Equal));
 
     int qid = m_store->exec(q);
 
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", 1));
     QVERIFY(!m_store->next(qid));
 
     q.setTerm(Term((propInfo.name()), dt, Term::Equal));
 
     qid = m_store->exec(q);
 
     QVERIFY(m_store->next(qid));
     QCOMPARE(m_store->id(qid), serialize("file", 1));
     QVERIFY(!m_store->next(qid));
 }
 
 QTEST_MAIN(Baloo::FileSearchStoreTest)
diff --git a/autotests/unit/codecs/positioncodectest.cpp b/autotests/unit/codecs/positioncodectest.cpp
index aab908aa..3603e7cd 100644
--- a/autotests/unit/codecs/positioncodectest.cpp
+++ b/autotests/unit/codecs/positioncodectest.cpp
@@ -1,121 +1,121 @@
 /*
    This file is part of the KDE Baloo project.
    Copyright (C) 2016 Christian Ehrlicher <ch.ehrlicher@gmx.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) version 3, or any
    later version accepted by the membership of KDE e.V. (or its
    successor approved by the membership of KDE e.V.), which shall
    act as a proxy defined in Section 6 of version 3 of the license.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <QCryptographicHash>
-#include <QtTest>
+#include <QTest>
 #include "positioncodec.h"
 #include "positioninfo.h"
 
 using namespace Baloo;
 
 class PositionCodecTest : public QObject
 {
 Q_OBJECT
 public:
     PositionCodecTest() = default;
     ~PositionCodecTest() = default;
 private Q_SLOTS:
     void initTestCase();
     void checkEncodeOutput();
     void checkEncodeOutput2();
     void checkEncodeOutput3();
 private:
     QVector<PositionInfo> m_data;
     QVector<PositionInfo> m_data2;
     QVector<PositionInfo> m_data3;
 };
 
 QTEST_MAIN ( PositionCodecTest )
 
 void PositionCodecTest::initTestCase()
 {
     m_data.clear();
     m_data.reserve(100);
     for(int i = 0; i < 100; ++i)
     {
         PositionInfo info;
         info.docId = (i + 1) * 4711;
         info.positions.reserve(3000);
         for (int j = 0; j < 3000; j++)
             info.positions.append((j + 1) * (i * 2));
         m_data.append(info);
     }
 
     m_data2.clear();
     m_data2.reserve(5000);
     for (int i = 0; i < 5000; i++) {
         PositionInfo info;
         info.docId = i;
         info.positions = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
 
         m_data2.append(info);
     }
 
     m_data3.clear();
     m_data3.reserve(200);
     for (int i = 0; i < 200; i++) {
         PositionInfo info;
         info.docId = i;
         info.positions.reserve(30000); // > 2^14 -> 3 byte VarInt32
         for (int j = 0; j < 30000; j++)
             info.positions.append((j + 1) * 200); // increment 200 -> 2 byte DiffVarInt32
 
         m_data3.append(info);
     }
 }
 
 void PositionCodecTest::checkEncodeOutput()
 {
     PositionCodec pc;
     const QByteArray ba = pc.encode(m_data);
     QCOMPARE(ba.size(), 409000);
     const QByteArray md5 = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex();
     QCOMPARE(md5, QByteArray("ae49eb3279bdda36ef91d29ce3c94c2c"));
     // and now decode the whole stuff
     QVector<PositionInfo> decodedData = pc.decode(ba);
     QCOMPARE(m_data, decodedData);
 }
 
 void PositionCodecTest::checkEncodeOutput2()
 {
     PositionCodec pc;
     const QByteArray ba = pc.encode(m_data2);
     QCOMPARE(ba.size(), (8 + 1 + 10) * 5000); // DocId, VarInt32 len, DiffVarInt position
     const QByteArray md5 = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex();
     QCOMPARE(md5, QByteArray("2f3710246331002e2332dce560ccd783"));
     // and now decode the whole stuff
     QVector<PositionInfo> decodedData = pc.decode(ba);
     QCOMPARE(m_data2, decodedData);
 }
 
 void PositionCodecTest::checkEncodeOutput3()
 {
     PositionCodec pc;
     const QByteArray ba = pc.encode(m_data3);
     QCOMPARE(ba.size(), (8 + 3 + (2 * 30000)) * 200); // DocId, VarInt32 len, DiffVarInt position
     const QByteArray md5 = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex();
     QCOMPARE(md5, QByteArray("79e942003c082073b4cee8e376fffdaa"));
     // and now decode the whole stuff
     QVector<PositionInfo> decodedData = pc.decode(ba);
     QCOMPARE(m_data3, decodedData);
 }
 
 #include "positioncodectest.moc"