diff --git a/autotests/integration/writetransactiontest.cpp b/autotests/integration/writetransactiontest.cpp
index 2e54d6cc..c3991e77 100644
--- a/autotests/integration/writetransactiontest.cpp
+++ b/autotests/integration/writetransactiontest.cpp
@@ -1,449 +1,450 @@
 /*
  * This file is part of the KDE Baloo project.
  * Copyright (C) 2015  Vishesh Handa <vhanda@kde.org>
  *
  * 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) any later version.
  *
  * 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, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
 #include "writetransaction.h"
 #include "dbstate.h"
 #include "database.h"
 #include "idutils.h"
 
 #include <QTest>
 #include <QTemporaryDir>
 
 using namespace Baloo;
 
 class WriteTransactionTest : public QObject
 {
     Q_OBJECT
 private Q_SLOTS:
     void init() {
         dir = new QTemporaryDir();
         db = new Database(dir->path());
         db->open(Database::CreateDatabase);
     }
 
     void cleanup() {
         delete db;
         delete dir;
     }
 
     void testAddDocument();
     void testAddDocumentTwoDocuments();
     void testAddAndRemoveOneDocument();
     void testAddAndReplaceOneDocument();
     void testIdempotentDocumentChange();
 
     void testRemoveRecursively();
     void testDocumentId();
     void testTermPositions();
 private:
     QTemporaryDir* dir;
     Database* db;
 };
 
-static quint64 touchFile(const QString& path) {
+static void touchFile(const QString& path) {
     QFile file(path);
     file.open(QIODevice::WriteOnly);
     file.write("data");
     file.close();
-
-    return filePathToId(QFile::encodeName(path));
 }
 
 void WriteTransactionTest::testAddDocument()
 {
     Transaction tr(db, Transaction::ReadWrite);
 
-    const QByteArray url(dir->path().toUtf8() + "/file");
-    touchFile(url);
+    const QString filePath(dir->path() + "/file");
+    touchFile(filePath);
+    QByteArray url = QFile::encodeName(filePath);
     quint64 id = filePathToId(url);
 
     QCOMPARE(tr.hasDocument(id), false);
 
     Document doc;
     doc.setId(id);
     doc.setUrl(url);
     doc.addTerm("a");
     doc.addTerm("ab");
     doc.addTerm("abc");
     doc.addTerm("power");
     doc.addFileNameTerm("link");
     doc.addXattrTerm("system");
     doc.setMTime(1);
     doc.setCTime(2);
 
     tr.addDocument(doc);
     tr.commit();
 
     Transaction tr2(db, Transaction::ReadOnly);
 
     DBState state;
     state.postingDb = {{"a", {id}}, {"ab", {id}}, {"abc", {id}}, {"power", {id}}, {"system", {id}}, {"link", {id}}};
     state.positionDb = {};
     state.docTermsDb = {{id, {"a", "ab", "abc", "power"} }};
     state.docFileNameTermsDb = {{id, {"link"} }};
     state.docXAttrTermsDb = {{id, {"system"} }};
     state.docTimeDb = {{id, DocumentTimeDB::TimeInfo(1, 2)}};
     state.mtimeDb = {{1, id}};
 
     DBState actualState = DBState::fromTransaction(&tr2);
     QCOMPARE(actualState, state);
 }
 
 
-static Document createDocument(const QByteArray& url, quint32 mtime, quint32 ctime, const QVector<QByteArray>& terms,
+static Document createDocument(const QString& filePath, quint32 mtime, quint32 ctime, const QVector<QByteArray>& terms,
                                const QVector<QByteArray>& fileNameTerms, const QVector<QByteArray>& xattrTerms)
 {
     Document doc;
+
+    const QByteArray url = QFile::encodeName(filePath);
     doc.setId(filePathToId(url));
     doc.setUrl(url);
 
     for (const QByteArray& term: terms) {
         doc.addTerm(term);
     }
     for (const QByteArray& term: fileNameTerms) {
         doc.addFileNameTerm(term);
     }
     for (const QByteArray& term: xattrTerms) {
         doc.addXattrTerm(term);
     }
     doc.setMTime(mtime);
     doc.setCTime(ctime);
 
     return doc;
 }
 
 void WriteTransactionTest::testAddDocumentTwoDocuments()
 {
-    const QByteArray url1(dir->path().toUtf8() + "/file1");
-    const QByteArray url2(dir->path().toUtf8() + "/file2");
+    const QString url1(dir->path() + "/file1");
+    const QString url2(dir->path() + "/file2");
     touchFile(url1);
     touchFile(url2);
 
     Document doc1 = createDocument(url1, 5, 1, {"a", "abc", "dab"}, {"file1"}, {});
     Document doc2 = createDocument(url2, 6, 2, {"a", "abcd", "dab"}, {"file2"}, {});
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.addDocument(doc1);
         tr.addDocument(doc2);
         tr.commit();
     }
 
     Transaction tr(db, Transaction::ReadOnly);
 
     quint64 id1 = doc1.id();
     quint64 id2 = doc2.id();
 
     DBState state;
     state.postingDb = {{"a", {id1, id2}}, {"abc", {id1}}, {"abcd", {id2}}, {"dab", {id1, id2}}, {"file1", {id1}}, {"file2", {id2}}};
     state.positionDb = {};
     state.docTermsDb = {{id1, {"a", "abc", "dab"}}, {id2, {"a", "abcd", "dab"}}};
     state.docFileNameTermsDb = {{id1, {"file1"}}, {id2, {"file2"}}};
     state.docXAttrTermsDb = {};
     state.docTimeDb = {{id1, DocumentTimeDB::TimeInfo(5, 1)}, {id2, DocumentTimeDB::TimeInfo(6, 2)}};
     state.mtimeDb = {{5, id1}, {6, id2}};
 
     DBState actualState = DBState::fromTransaction(&tr);
     QVERIFY(DBState::debugCompare(actualState, state));
 }
 
 void WriteTransactionTest::testAddAndRemoveOneDocument()
 {
-    const QByteArray url1(dir->path().toUtf8() + "/file1");
+    const QString url1(dir->path() + "/file1");
     touchFile(url1);
 
     Document doc1 = createDocument(url1, 5, 1, {"a", "abc", "dab"}, {"file1"}, {});
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.addDocument(doc1);
         tr.commit();
     }
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.removeDocument(doc1.id());
         tr.commit();
     }
 
     Transaction tr(db, Transaction::ReadOnly);
     DBState actualState = DBState::fromTransaction(&tr);
     QVERIFY(DBState::debugCompare(actualState, DBState()));
 }
 
 void WriteTransactionTest::testAddAndReplaceOneDocument()
 {
-    const QByteArray url1(dir->path().toUtf8() + "/file1");
+    const QString url1(dir->path() + "/file1");
     touchFile(url1);
 
     Document doc1 = createDocument(url1, 5, 1, {"a", "abc", "dab"}, {"file1"}, {});
     Document doc2 = createDocument(url1, 6, 2, {"a", "abc", "xxx"}, {"file1", "yyy"}, {});
     quint64 id = doc1.id();
     doc2.setId(id);
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.addDocument(doc1);
         tr.commit();
     }
 
     DBState state;
     state.postingDb = {{"a", {id}}, {"abc", {id}}, {"dab", {id}}, {"file1", {id}} };
     state.positionDb = {};
     state.docTermsDb = {{id, {"a", "abc", "dab"} }};
     state.docFileNameTermsDb = {{id, {"file1"} }};
     state.docXAttrTermsDb = {};
     state.docTimeDb = {{id, DocumentTimeDB::TimeInfo(5, 1)}};
     state.mtimeDb = {{5, id}};
 
     {
         Transaction tr(db, Transaction::ReadOnly);
         DBState actualState = DBState::fromTransaction(&tr);
         QVERIFY(DBState::debugCompare(actualState, state));
     }
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.replaceDocument(doc2, DocumentOperation::Everything);
         tr.commit();
     }
 
     state.postingDb = {{"a", {id}}, {"abc", {id}}, {"xxx", {id}}, {"file1", {id}}, {"yyy", {id}} };
     state.docTermsDb = {{id, {"a", "abc", "xxx"} }};
     state.docFileNameTermsDb = {{id, {"file1", "yyy"} }};
     state.docTimeDb = {{id, DocumentTimeDB::TimeInfo(6, 2)}};
     state.mtimeDb = {{6, id}};
 
     Transaction tr(db, Transaction::ReadOnly);
     DBState actualState = DBState::fromTransaction(&tr);
     QVERIFY(DBState::debugCompare(actualState, state));
 }
 
 void WriteTransactionTest::testRemoveRecursively()
 {
-    QByteArray path = dir->path().toUtf8();
+    const QString path = dir->path();
+    const QString url1(path + "/file1");
+    const QString dirPath(path + "/dir");
+    const QString url2(dirPath + "/file1");
 
-    const QByteArray url1(path + "/file1");
     touchFile(url1);
-    const QByteArray dirPath(path + "/dir");
-    QDir().mkpath(QString::fromUtf8(dirPath));
-    const QByteArray url2(dirPath + "/file1");
+    QDir().mkpath(dirPath);
     touchFile(url2);
 
     Document doc1 = createDocument(url1, 5, 1, {"a", "abc", "dab"}, {"file1"}, {});
     Document doc2 = createDocument(url2, 5, 1, {"a", "abc", "dab"}, {"file1"}, {});
     Document doc3 = createDocument(dirPath, 5, 1, {"a"}, {"dir"}, {});
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.addDocument(doc1);
         tr.addDocument(doc2);
         tr.addDocument(doc3);
         tr.commit();
     }
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.removeRecursively(filePathToId(dir->path().toUtf8()));
         tr.commit();
     }
 
     Transaction tr(db, Transaction::ReadOnly);
     DBState actualState = DBState::fromTransaction(&tr);
     QVERIFY(DBState::debugCompare(actualState, DBState()));
 }
 
 void WriteTransactionTest::testDocumentId()
 {
-    const QByteArray url1(dir->path().toUtf8() + "/file1");
+    const QString url1(dir->path() + "/file1");
     touchFile(url1);
 
     Document doc1 = createDocument(url1, 5, 1, {"a", "abc", "dab"}, {"file1"}, {});
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.addDocument(doc1);
         tr.commit();
     }
 
     Transaction tr(db, Transaction::ReadOnly);
-    QCOMPARE(tr.documentId(url1), doc1.id());
+    QCOMPARE(tr.documentId(QFile::encodeName(url1)), doc1.id());
 }
 
 void WriteTransactionTest::testTermPositions()
 {
-    const QByteArray url1(dir->path().toUtf8() + "/file1");
+    const QString url1(dir->path() + "/file1");
+    const QString url2(dir->path() + "/file2");
+    const QString url3(dir->path() + "/file3");
     touchFile(url1);
-    const QByteArray url2(dir->path().toUtf8() + "/file2");
     touchFile(url2);
-    const QByteArray url3(dir->path().toUtf8() + "/file3");
     touchFile(url3);
 
     Document doc1 = createDocument(url1, 5, 1, {"a", "abc", "dab"}, {"file1"}, {});
     quint64 id1 = doc1.id();
     Document doc2 = createDocument(url2, 5, 2, {"a", "abcd"}, {"file2"}, {});
     quint64 id2 = doc2.id();
     Document doc3 = createDocument(url3, 6, 3, {"dab"}, {"file3"}, {});
     quint64 id3 = doc3.id();
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.addDocument(doc1);
         tr.addDocument(doc2);
         tr.addDocument(doc3);
         tr.commit();
     }
 
     DBState state;
     state.postingDb = {{"a", {id1, id2}}, {"abc", {id1}}, {"abcd", {id2}}, {"dab", {id1, id3}}, {"file1", {id1}}, {"file2", {id2}}, {"file3", {id3}} };
     state.positionDb = {};
     state.docTermsDb = {{id1, {"a", "abc", "dab"}}, {id2, {"a", "abcd"}}, {id3, {"dab"}} };
     state.docFileNameTermsDb = {{id1, {"file1"}}, {id2, {"file2"}}, {id3, {"file3"}} };
     state.docXAttrTermsDb = {};
     state.docTimeDb = {{id1, DocumentTimeDB::TimeInfo(5, 1)}, {id2, DocumentTimeDB::TimeInfo(5, 2)}, {id3, DocumentTimeDB::TimeInfo(6, 3)} };
     state.mtimeDb = {{5, id1}, {5, id2}, {6, id3} };
 
     {
         Transaction tr(db, Transaction::ReadOnly);
         DBState actualState = DBState::fromTransaction(&tr);
         QVERIFY(DBState::debugCompare(actualState, state));
     }
 
     for (auto pos : {1, 3, 6}) {
         doc1.addPositionTerm("a", pos);
     }
     for (auto pos : {2, 4, 5}) {
         doc1.addPositionTerm("abc", pos);
     }
     for (auto pos : {12, 14, 15}) {
         doc1.addPositionTerm("dab", pos);
     }
     for (auto pos : {11, 12}) {
         doc3.addPositionTerm("dab", pos);
     }
     state.positionDb["a"] = {PositionInfo(id1, {1, 3, 6})};
     state.positionDb["abc"] = {PositionInfo(id1, {2, 4, 5})};
     if (id1 < id3) {
         state.positionDb["dab"] = {PositionInfo(id1, {12, 14, 15}), PositionInfo(id3, {11, 12})};
     } else {
         state.positionDb["dab"] = {PositionInfo(id3, {11, 12}), PositionInfo(id1, {12, 14, 15})};
     }
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.replaceDocument(doc1, DocumentOperation::Everything);
         tr.replaceDocument(doc3, DocumentOperation::Everything);
         tr.commit();
     }
     {
         Transaction tr(db, Transaction::ReadOnly);
         DBState actualState = DBState::fromTransaction(&tr);
         QVERIFY(DBState::debugCompare(actualState, state));
     }
 
     for (auto pos : {11, 12}) { // extend
         doc1.addPositionTerm("abc", pos);
     }
     for (auto pos : {16, 17}) { // extend, make sure positions for doc3 are kept
         doc1.addPositionTerm("dab", pos);
     }
     for (auto pos : {7, 8, 9}) { // add positions
         doc2.addPositionTerm("a", pos);
     }
     for (auto pos : {7, 8, 9}) { // add new term with positions
         doc2.addPositionTerm("abc", pos);
     }
     state.postingDb = {{"a", {id1, id2}}, {"abc", {id1, id2}}, {"abcd", {id2}}, {"dab", {id1, id3}}, {"file1", {id1}}, {"file2", {id2}}, {"file3", {id3}} };
     state.docTermsDb = {{id1, {"a", "abc", "dab"}}, {id2, {"a", "abc", "abcd"}}, {id3, {"dab"}} };
     if (id1 < id2) {
         state.positionDb["a"] = {PositionInfo(id1, {1, 3, 6}), PositionInfo(id2, {7, 8, 9})};
         state.positionDb["abc"] = {PositionInfo(id1, {2, 4, 5, 11, 12}), PositionInfo(id2, {7, 8, 9})};
     } else {
         state.positionDb["a"] = {PositionInfo(id2, {7, 8, 9}), PositionInfo(id1, {1, 3, 6})};
         state.positionDb["abc"] = {PositionInfo(id2, {7, 8, 9}), PositionInfo(id1, {2, 4, 5, 11, 12})};
     }
     if (id1 < id3) {
         state.positionDb["dab"] = {PositionInfo(id1, {12, 14, 15, 16, 17}), PositionInfo(id3, {11, 12})};
     } else {
         state.positionDb["dab"] = {PositionInfo(id3, {11, 12}), PositionInfo(id1, {12, 14, 15, 16, 17})};
     }
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.replaceDocument(doc1, DocumentOperation::Everything);
         tr.replaceDocument(doc2, DocumentOperation::Everything);
         tr.commit();
     }
     {
         Transaction tr(db, Transaction::ReadOnly);
         DBState actualState = DBState::fromTransaction(&tr);
         QVERIFY(DBState::debugCompare(actualState, state));
     }
 }
 
 void WriteTransactionTest::testIdempotentDocumentChange()
 {
-    const QByteArray url1(dir->path().toUtf8() + "/file1");
+    const QString url1(dir->path() + "/file1");
     touchFile(url1);
 
     Document doc1 = createDocument(url1, 5, 1, {"a", "abc", "dab"}, {"file1"}, {});
     Document doc2 = createDocument(url1, 5, 1, {"a", "abcd", "dab"}, {"file1"}, {});
     quint64 id = doc1.id();
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.addDocument(doc1);
         tr.commit();
     }
 
     DBState state;
     state.postingDb = {{"a", {id}}, {"abc", {id}}, {"dab", {id}}, {"file1", {id}} };
     state.positionDb = {};
     state.docTermsDb = {{id, {"a", "abc", "dab"} }};
     state.docFileNameTermsDb = {{id, {"file1"} }};
     state.docXAttrTermsDb = {};
     state.docTimeDb = {{id, DocumentTimeDB::TimeInfo(5, 1)}};
     state.mtimeDb = {{5, id}};
 
     {
         Transaction tr(db, Transaction::ReadOnly);
         DBState actualState = DBState::fromTransaction(&tr);
         QVERIFY(DBState::debugCompare(actualState, state));
     }
 
     {
         Transaction tr(db, Transaction::ReadWrite);
         tr.replaceDocument(doc2, DocumentOperation::Everything);
         tr.replaceDocument(doc2, DocumentOperation::Everything);
         tr.commit();
     }
 
     state.postingDb = {{"a", {id}}, {"abcd", {id}}, {"dab", {id}}, {"file1", {id}} };
     state.docTermsDb = {{id, {"a", "abcd", "dab"} }};
 
     {
         Transaction tr(db, Transaction::ReadOnly);
         DBState actualState = DBState::fromTransaction(&tr);
         QVERIFY(DBState::debugCompare(actualState, state));
     }
 
 }
 
 QTEST_MAIN(WriteTransactionTest)
 
 #include "writetransactiontest.moc"