diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp
index a84a7e0..148a311 100644
--- a/src/colnod/syncmanager.cpp
+++ b/src/colnod/syncmanager.cpp
@@ -204,6 +204,8 @@ std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<
 
 void SyncManager::initNewToken(const std::shared_ptr<Token>& token)
 {
+    Q_ASSERT(database);
+    Q_ASSERT(token);
     qint16 num = database->getNumOfTokensOfSubject(token->subjectId());
     token->setName(database->getSubjectNameByTokenId(token->id()) + "_mobile_" + QString::number(num + 1));
     token->setDescription("mobile");
@@ -214,9 +216,6 @@ void SyncManager::initNewToken(const std::shared_ptr<Token>& token)
 
 std::unique_ptr<PreparedData> SyncManager::prepareDataUsindOld(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData)
 {
-    Q_UNUSED(databaseData);
-    Q_UNUSED(colnodData);
-
     qInfo(syncmanager) << equals;
     qInfo(syncmanager) << "PREPARING DATA -> BEGIN";
     qInfo(syncmanager) << dash;
diff --git a/test/auto/colnod/tst_colnodapi.cpp b/test/auto/colnod/tst_colnodapi.cpp
index fd91abc..2ae370e 100644
--- a/test/auto/colnod/tst_colnodapi.cpp
+++ b/test/auto/colnod/tst_colnodapi.cpp
@@ -21,6 +21,7 @@ private slots:
     void login();
     void getTokens();
     void download_data_test();
+    void download_data_test_now();
     void download_data_fail_test();
 
 private:
@@ -60,28 +61,32 @@ void ColnodTest::download_data_test()
 {
     serversdk::RequestManager reqMan;
     ColnodAPI colnod(&reqMan);
-    {
-        QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
-        QVERIFY(spy.isValid());
-        colnod.downloadData(Timestamp(1570190399259));
-        QVERIFY(spy.wait());
 
-        auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
-        QVERIFY(data);
+    QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
+    QVERIFY(spy.isValid());
+    colnod.downloadData(Timestamp(1570190399259));
+    QVERIFY(spy.wait());
 
-        QVERIFY(! data->updatedTokens.isEmpty());
-        QVERIFY(data->updatedTokens.contains("5e2f1260-da1c-441f-9644-24dfe3b97b2a"));
-    }
-    {
-        Timestamp time(QDateTime::currentMSecsSinceEpoch());
-        colnod.downloadData(time);
-        QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
-        QVERIFY(spy.wait());
-        auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
-        QVERIFY(data);
+    auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
+    QVERIFY(data);
 
-        QVERIFY(! data->updatedTokens.isEmpty());
-    }
+    QVERIFY(! data->updatedTokens.isEmpty());
+    QVERIFY(data->updatedTokens.contains("5e2f1260-da1c-441f-9644-24dfe3b97b2a"));
+}
+
+void ColnodTest::download_data_test_now()
+{
+    serversdk::RequestManager reqMan;
+    ColnodAPI colnod(&reqMan);
+
+    Timestamp time(QDateTime::currentMSecsSinceEpoch());
+    colnod.downloadData(time);
+    QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
+    QVERIFY(spy.wait());
+    auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
+    QVERIFY(data);
+
+    QVERIFY(data->updatedTokens.isEmpty());
 }
 
 void ColnodTest::download_data_fail_test()
diff --git a/test/auto/syncmanager/tst_syncmanager.cpp b/test/auto/syncmanager/tst_syncmanager.cpp
index bd244f0..95a43ce 100644
--- a/test/auto/syncmanager/tst_syncmanager.cpp
+++ b/test/auto/syncmanager/tst_syncmanager.cpp
@@ -25,12 +25,21 @@ void SyncManagerTest::prepareData_test()
     auto dbData = std::make_shared<Data>();
     auto colnodData = std::make_shared<Data>();
 
+    auto token = std::make_shared<Token>();
+    token->setId("id1");
+    dbData->updatedTokens.insert("id1", token);
+
+
     auto oldPreparedData = sync.prepareDataUsindOld(dbData, colnodData);
     auto newPreparedData = sync.prepareDataNew(dbData, colnodData);
-
-    QCOMPARE(newPreparedData, oldPreparedData);
-
-
+    QVERIFY(oldPreparedData->databaseData->updatedTokens.contains("id1"));
+    QVERIFY(newPreparedData->databaseData->updatedTokens.contains("id1"));
+    QVERIFY(oldPreparedData->databaseData->updatedSubjects.isEmpty());
+    QVERIFY(newPreparedData->databaseData->updatedSubjects.isEmpty());
+    QVERIFY(oldPreparedData->databaseData->deletedTokens.isEmpty());
+    QVERIFY(newPreparedData->databaseData->deletedTokens.isEmpty());
+    QVERIFY(oldPreparedData->databaseData->deletedSubjects.isEmpty());
+    QVERIFY(newPreparedData->databaseData->deletedSubjects.isEmpty());
 }
 
 QTEST_MAIN(SyncManagerTest)