diff --git a/tests/core/ApplicationSettingsTest.cpp b/tests/core/ApplicationSettingsTest.cpp
index f22104bc3..e87f3b7d5 100644
--- a/tests/core/ApplicationSettingsTest.cpp
+++ b/tests/core/ApplicationSettingsTest.cpp
@@ -1,169 +1,169 @@
 /* GCompris - ApplicationSettingsTest.cpp
  *
  * Copyright (C) 2018 Himanshu Vishwakarma <himvish997@gmail.com>
  *
  * Authors:
  *   Himanshu Vishwakarma <himvish997@gmail.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 3 of the License, or
  *   (at your option) any later version.
  *
  *   This program 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 General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <QtTest>
 #include <QObject>
 
 #include "src/core/ApplicationSettings.h"
 #include "ApplicationSettingsMock.h"
 
 #define APPLICATION_SETTINGS_TEST_ATTRIBUTE(attributeType, attributeName, accessorName, accessorNameChanged) \
 { \
     QFETCH(attributeType, attributeName); \
     QSignalSpy spy(&applicationSettingsMock, &ApplicationSettings::accessorNameChanged); \
     QVERIFY(spy.count() == 0); \
     applicationSettingsMock.accessorName(attributeName); \
     QVERIFY(spy.count() == 1); \
     QCOMPARE(applicationSettingsMock.attributeName(), attributeName); \
 }
 
 class CoreApplicationSettingsTest : public QObject
 {
     Q_OBJECT
 private slots:
     void ApplicationSettingsInitializationTest();
     void ApplicationSettingsTest();
     void ApplicationSettingsTest_data();
     void ActivitySettingsTest();
 };
 
 void CoreApplicationSettingsTest::ApplicationSettingsInitializationTest()
 {
     ApplicationSettingsMock applicationSettings;
     QCOMPARE(applicationSettings.baseFontSizeMin(), -7);
     QCOMPARE(applicationSettings.baseFontSizeMax(), 7);
     QCOMPARE(applicationSettings.fontLetterSpacingMin(), (qreal)0.0);
     QCOMPARE(applicationSettings.fontLetterSpacingMax(), (qreal)8.0);
 }
 
 void CoreApplicationSettingsTest::ApplicationSettingsTest_data()
 {
     QTest::addColumn<bool>("showLockedActivities");
     QTest::addColumn<bool>("isAudioVoicesEnabled");
     QTest::addColumn<bool>("isAudioEffectsEnabled");
-    QTest::addColumn<qint32>("previousHeight");
-    QTest::addColumn<qint32>("previousWidth");
+    QTest::addColumn<quint32>("previousHeight");
+    QTest::addColumn<quint32>("previousWidth");
     QTest::addColumn<bool>("isVirtualKeyboard");
     QTest::addColumn<QString>("locale");
     QTest::addColumn<QString>("font");
     QTest::addColumn<bool>("isEmbeddedFont");
     QTest::addColumn<quint32>("fontCapitalization");
     QTest::addColumn<qreal>("fontLetterSpacing");
     QTest::addColumn<bool>("isAutomaticDownloadsEnabled");
     QTest::addColumn<quint32>("filterLevelMin");
     QTest::addColumn<quint32>("filterLevelMax");
     QTest::addColumn<bool>("isDemoMode");
     QTest::addColumn<QString>("codeKey");
     QTest::addColumn<bool>("isKioskMode");
     QTest::addColumn<bool>("sectionVisible");
     QTest::addColumn<QString>("wordset");
     QTest::addColumn<QString>("downloadServerUrl");
     QTest::addColumn<QString>("cachePath");
     QTest::addColumn<quint32>("exeCount");
     QTest::addColumn<bool>("isBarHidden");
     QTest::addColumn<int>("baseFontSize");
     QTest::addColumn<int>("lastGCVersionRan");
 
-    QTest::newRow("dummySettings1") << true << true << true << (qint32)21 << (qint32)25 << true << "en_EN" << "font1" << true << (quint32)36 << (qreal)2.532 << true << (quint32)26 << (quint32)84 << true << "codeKey1" << true << true << "wordset1" << "downloadServerUrl1" << "cachePath1" << (quint32)48 << true << 7 << 52 ;
-    QTest::newRow("dummySettings2") << false << false << false << (qint32)20 << (qint32)32 << false << "en_US" << "font2" << false << (quint32)34 <<(qreal)2.3 << false << (quint32)24 << (quint32)80 << false << "codekey2" << false << false << "wordset2" << "downloadServerUrl2" << "cachePath2" << (quint32)44 << false << 5 << 64 ;
+    QTest::newRow("dummySettings1") << true << true << true << (quint32)21 << (quint32)25 << true << "en_EN" << "font1" << true << (quint32)36 << (qreal)2.532 << true << (quint32)26 << (quint32)84 << true << "codeKey1" << true << true << "wordset1" << "downloadServerUrl1" << "cachePath1" << (quint32)48 << true << 7 << 52 ;
+    QTest::newRow("dummySettings2") << false << false << false << (quint32)20 << (quint32)32 << false << "en_US" << "font2" << false << (quint32)34 <<(qreal)2.3 << false << (quint32)24 << (quint32)80 << false << "codekey2" << false << false << "wordset2" << "downloadServerUrl2" << "cachePath2" << (quint32)44 << false << 5 << 64 ;
 }
 
 void CoreApplicationSettingsTest::ApplicationSettingsTest()
 {
     ApplicationSettingsMock applicationSettingsMock;
     ApplicationSettingsMock::getInstance();
 
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, showLockedActivities, setShowLockedActivities, showLockedActivitiesChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, isAudioVoicesEnabled, setIsAudioVoicesEnabled, audioVoicesEnabledChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, isAudioEffectsEnabled, setIsAudioEffectsEnabled, audioEffectsEnabledChanged);
-    APPLICATION_SETTINGS_TEST_ATTRIBUTE(qint32, previousHeight, setPreviousHeight, previousHeightChanged);
-    APPLICATION_SETTINGS_TEST_ATTRIBUTE(qint32, previousWidth, setPreviousWidth, previousWidthChanged);
+    APPLICATION_SETTINGS_TEST_ATTRIBUTE(quint32, previousHeight, setPreviousHeight, previousHeightChanged);
+    APPLICATION_SETTINGS_TEST_ATTRIBUTE(quint32, previousWidth, setPreviousWidth, previousWidthChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, isVirtualKeyboard, setVirtualKeyboard, virtualKeyboardChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(QString, locale, setLocale, localeChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(QString, font, setFont, fontChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, isEmbeddedFont, setIsEmbeddedFont, embeddedFontChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(quint32, fontCapitalization, setFontCapitalization, fontCapitalizationChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(qreal, fontLetterSpacing, setFontLetterSpacing, fontLetterSpacingChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, isAutomaticDownloadsEnabled, setIsAutomaticDownloadsEnabled, automaticDownloadsEnabledChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(quint32, filterLevelMin, setFilterLevelMin, filterLevelMinChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(quint32, filterLevelMax, setFilterLevelMax, filterLevelMaxChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, isDemoMode, setDemoMode, demoModeChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(QString, codeKey, setCodeKey, codeKeyChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, isKioskMode, setKioskMode, kioskModeChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, sectionVisible, setSectionVisible, sectionVisibleChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(QString, wordset, setWordset, wordsetChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(QString, downloadServerUrl, setDownloadServerUrl, downloadServerUrlChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(QString, cachePath, setCachePath, cachePathChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(quint32, exeCount, setExeCount, exeCountChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(bool, isBarHidden, setBarHidden, barHiddenChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(int, baseFontSize, setBaseFontSize, baseFontSizeChanged);
     APPLICATION_SETTINGS_TEST_ATTRIBUTE(int, lastGCVersionRan, setLastGCVersionRan, lastGCVersionRanChanged);
 
     delete ApplicationSettingsMock::getInstance();
 }
 
 void CoreApplicationSettingsTest::ActivitySettingsTest()
 {
     ApplicationSettingsMock applicationSettingsMock;
     ApplicationSettingsMock::getInstance();
     // Creating a dummyActivity
     QString dummyActivity = QStringLiteral("DummyActivity");
 
     // By Default the DummyActivity is not favorite
     QVERIFY(!applicationSettingsMock.isFavorite(dummyActivity));
     // Setting Up the DummyActivity as Favorite
     applicationSettingsMock.setFavorite(dummyActivity, true);
     QVERIFY(applicationSettingsMock.isFavorite(dummyActivity));
     // setting Up the DummyActivity as Not favorite
     applicationSettingsMock.setFavorite(dummyActivity, false);
     QVERIFY(!applicationSettingsMock.isFavorite(dummyActivity));
 
     // By Default the activity progress is zero
     QCOMPARE(applicationSettingsMock.loadActivityProgress(dummyActivity), 0);
     // Saving the Activity Progress
     applicationSettingsMock.saveActivityProgress(dummyActivity, 3);
     QCOMPARE(applicationSettingsMock.loadActivityProgress(dummyActivity), 3);
     applicationSettingsMock.saveActivityProgress(dummyActivity, 10);
     QCOMPARE(applicationSettingsMock.loadActivityProgress(dummyActivity), 10);
     applicationSettingsMock.saveActivityProgress(dummyActivity, 0);
     QCOMPARE(applicationSettingsMock.loadActivityProgress(dummyActivity), 0);
 
     // By Default the activity
     QVariantMap configuration;
     configuration.insert(QStringLiteral("DummyKey1"), QStringLiteral("DummyValue1"));
     configuration.insert(QStringLiteral("DummyKey2"), QStringLiteral("DummyValue2"));
     configuration.insert(QStringLiteral("DummyKey3"), QStringLiteral("DummyValue3"));
     configuration.insert(QStringLiteral("DummyKey4"), QStringLiteral("DummyValue4"));
 
     applicationSettingsMock.saveActivityConfiguration(dummyActivity, configuration);
     QVariantMap newconfiguration = applicationSettingsMock.loadActivityConfiguration(dummyActivity);
 
     QCOMPARE(newconfiguration.value(QStringLiteral("DummyKey1")), configuration.value(QStringLiteral("DummyKey1")));
     QCOMPARE(newconfiguration.value(QStringLiteral("DummyKey2")), configuration.value(QStringLiteral("DummyKey2")));
     QCOMPARE(newconfiguration.value(QStringLiteral("DummyKey3")), configuration.value(QStringLiteral("DummyKey3")));
     QCOMPARE(newconfiguration.value(QStringLiteral("DummyKey4")), configuration.value(QStringLiteral("DummyKey4")));
 
     delete ApplicationSettingsMock::getInstance();
 }
 
 QTEST_MAIN(CoreApplicationSettingsTest)
 #include "ApplicationSettingsTest.moc"