diff --git a/src/presentation/noteapplicationmodel.cpp b/src/presentation/noteapplicationmodel.cpp
--- a/src/presentation/noteapplicationmodel.cpp
+++ b/src/presentation/noteapplicationmodel.cpp
@@ -59,7 +59,7 @@
 
 void NoteApplicationModel::setDefaultDataSource(const Domain::DataSource::Ptr &source)
 {
-    m_noteRepository->setDefaultSource(source);
+    m_sourceQueries->setDefaultSource(source);
 }
 
 Domain::QueryResult<Domain::DataSource::Ptr>::Ptr NoteApplicationModel::createDataSourceQueryResult()
@@ -69,7 +69,7 @@
 
 bool NoteApplicationModel::isDefaultSource(const Domain::DataSource::Ptr &source)
 {
-    return m_noteRepository->isDefaultSource(source);
+    return m_sourceQueries->isDefaultSource(source);
 }
 
 AvailablePagesModelInterface *NoteApplicationModel::createAvailablePagesModel()
diff --git a/src/presentation/taskapplicationmodel.cpp b/src/presentation/taskapplicationmodel.cpp
--- a/src/presentation/taskapplicationmodel.cpp
+++ b/src/presentation/taskapplicationmodel.cpp
@@ -57,7 +57,7 @@
 
 void TaskApplicationModel::setDefaultDataSource(const Domain::DataSource::Ptr &source)
 {
-    m_taskRepository->setDefaultSource(source);
+    m_sourceQueries->setDefaultSource(source);
 }
 
 Domain::QueryResult<Domain::DataSource::Ptr>::Ptr TaskApplicationModel::createDataSourceQueryResult()
@@ -67,7 +67,7 @@
 
 bool TaskApplicationModel::isDefaultSource(const Domain::DataSource::Ptr &source)
 {
-    return m_taskRepository->isDefaultSource(source);
+    return m_sourceQueries->isDefaultSource(source);
 }
 
 AvailablePagesModelInterface *TaskApplicationModel::createAvailablePagesModel()
diff --git a/tests/units/presentation/noteapplicationmodeltest.cpp b/tests/units/presentation/noteapplicationmodeltest.cpp
--- a/tests/units/presentation/noteapplicationmodeltest.cpp
+++ b/tests/units/presentation/noteapplicationmodeltest.cpp
@@ -25,6 +25,8 @@
 
 #include "utils/mockobject.h"
 
+#define ZANSHIN_I_SWEAR_I_AM_IN_A_PRESENTATION_TEST
+
 #include "presentation/availablenotepagesmodel.h"
 #include "presentation/datasourcelistmodel.h"
 #include "presentation/noteapplicationmodel.h"
@@ -78,7 +80,6 @@
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
-        auto sourceQueries = Domain::DataSourceQueries::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
         auto taskRepository = Domain::TaskRepository::Ptr();
@@ -106,7 +107,7 @@
         QVERIFY(qobject_cast<Presentation::DataSourceListModel*>(notes));
     }
 
-    void shouldRetrieveDefaultNoteCollectionFromRepository()
+    void shouldRetrieveDefaultNoteCollectionFromQueries()
     {
         // GIVEN
 
@@ -126,18 +127,14 @@
         Utils::MockObject<Domain::DataSourceQueries> sourceQueriesMock;
         sourceQueriesMock(&Domain::DataSourceQueries::findNotes).when().thenReturn(sourceResult);
         sourceQueriesMock(&Domain::DataSourceQueries::findTasks).when().thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
-
-        // Repository mock returning the data source as default
-        Utils::MockObject<Domain::NoteRepository> noteRepositoryMock;
         foreach (const Domain::DataSource::Ptr &source, provider->data()) {
-            noteRepositoryMock(&Domain::NoteRepository::isDefaultSource).when(source).thenReturn(source == expectedSource);
+            sourceQueriesMock(&Domain::DataSourceQueries::isDefaultSource).when(source).thenReturn(source == expectedSource);
         }
 
         auto projectQueries = Domain::ProjectQueries::Ptr();
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
-        auto sourceQueries = Domain::DataSourceQueries::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
         auto taskRepository = Domain::TaskRepository::Ptr();
@@ -154,16 +151,16 @@
                                                taskQueries,
                                                taskRepository,
                                                noteQueries,
-                                               noteRepositoryMock.getInstance(),
+                                               noteRepository,
                                                tagQueries,
                                                tagRepository);
 
         // WHEN
         auto source = app.defaultDataSource();
 
         // THEN
         QCOMPARE(source, expectedSource);
-        QVERIFY(noteRepositoryMock(&Domain::NoteRepository::isDefaultSource).when(expectedSource).exactly(1));
+        QVERIFY(sourceQueriesMock(&Domain::DataSourceQueries::isDefaultSource).when(expectedSource).exactly(1));
     }
 
     void shouldGiveFirstNoteCollectionAsDefaultIfNoneMatched()
@@ -182,18 +179,14 @@
         Utils::MockObject<Domain::DataSourceQueries> sourceQueriesMock;
         sourceQueriesMock(&Domain::DataSourceQueries::findNotes).when().thenReturn(sourceResult);
         sourceQueriesMock(&Domain::DataSourceQueries::findTasks).when().thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
-
-        // Repository mock returning the data source as default
-        Utils::MockObject<Domain::NoteRepository> noteRepositoryMock;
         foreach (const Domain::DataSource::Ptr &source, provider->data()) {
-            noteRepositoryMock(&Domain::NoteRepository::isDefaultSource).when(source).thenReturn(false);
+            sourceQueriesMock(&Domain::DataSourceQueries::isDefaultSource).when(source).thenReturn(false);
         }
 
         auto projectQueries = Domain::ProjectQueries::Ptr();
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
-        auto sourceQueries = Domain::DataSourceQueries::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
         auto taskRepository = Domain::TaskRepository::Ptr();
@@ -210,7 +203,7 @@
                                                taskQueries,
                                                taskRepository,
                                                noteQueries,
-                                               noteRepositoryMock.getInstance(),
+                                               noteRepository,
                                                tagQueries,
                                                tagRepository);
 
@@ -234,14 +227,10 @@
         sourceQueriesMock(&Domain::DataSourceQueries::findNotes).when().thenReturn(sourceResult);
         sourceQueriesMock(&Domain::DataSourceQueries::findTasks).when().thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
 
-        // Repository mock returning the data source as default
-        Utils::MockObject<Domain::NoteRepository> noteRepositoryMock;
-
         auto projectQueries = Domain::ProjectQueries::Ptr();
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
-        auto sourceQueries = Domain::DataSourceQueries::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
         auto taskRepository = Domain::TaskRepository::Ptr();
@@ -258,7 +247,7 @@
                                                taskQueries,
                                                taskRepository,
                                                noteQueries,
-                                               noteRepositoryMock.getInstance(),
+                                               noteRepository,
                                                tagQueries,
                                                tagRepository);
 
@@ -269,7 +258,7 @@
         QVERIFY(source.isNull());
     }
 
-    void shouldForwardDefaultNoteCollectionToRepository()
+    void shouldForwardDefaultNoteCollectionToQueries()
     {
         // GIVEN
 
@@ -284,16 +273,13 @@
         Utils::MockObject<Domain::DataSourceQueries> sourceQueriesMock;
         sourceQueriesMock(&Domain::DataSourceQueries::findNotes).when().thenReturn(sourceResult);
         sourceQueriesMock(&Domain::DataSourceQueries::findTasks).when().thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
-
-        // Repository mock setting the default data source
-        Utils::MockObject<Domain::NoteRepository> noteRepositoryMock;
-        noteRepositoryMock(&Domain::NoteRepository::setDefaultSource).when(source).thenReturn();
+        sourceQueriesMock(&Domain::DataSourceQueries::isDefaultSource).when(source).thenReturn(false);
+        sourceQueriesMock(&Domain::DataSourceQueries::changeDefaultSource).when(source).thenReturn();
 
         auto projectQueries = Domain::ProjectQueries::Ptr();
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
-        auto sourceQueries = Domain::DataSourceQueries::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
         auto taskRepository = Domain::TaskRepository::Ptr();
@@ -310,15 +296,15 @@
                                                taskQueries,
                                                taskRepository,
                                                noteQueries,
-                                               noteRepositoryMock.getInstance(),
+                                               noteRepository,
                                                tagQueries,
                                                tagRepository);
 
         // WHEN
         app.setDefaultDataSource(source);
 
         // THEN
-        QVERIFY(noteRepositoryMock(&Domain::NoteRepository::setDefaultSource).when(source).exactly(1));
+        QVERIFY(sourceQueriesMock(&Domain::DataSourceQueries::changeDefaultSource).when(source).exactly(1));
     }
 };
 
diff --git a/tests/units/presentation/taskapplicationmodeltest.cpp b/tests/units/presentation/taskapplicationmodeltest.cpp
--- a/tests/units/presentation/taskapplicationmodeltest.cpp
+++ b/tests/units/presentation/taskapplicationmodeltest.cpp
@@ -25,6 +25,8 @@
 
 #include "utils/mockobject.h"
 
+#define ZANSHIN_I_SWEAR_I_AM_IN_A_PRESENTATION_TEST
+
 #include "presentation/availabletaskpagesmodel.h"
 #include "presentation/datasourcelistmodel.h"
 #include "presentation/taskapplicationmodel.h"
@@ -121,19 +123,17 @@
         Utils::MockObject<Domain::DataSourceQueries> sourceQueriesMock;
         sourceQueriesMock(&Domain::DataSourceQueries::findNotes).when().thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
         sourceQueriesMock(&Domain::DataSourceQueries::findTasks).when().thenReturn(sourceResult);
-
-        // Repository mock returning the data source as default
-        Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
         foreach (const Domain::DataSource::Ptr &source, provider->data()) {
-            taskRepositoryMock(&Domain::TaskRepository::isDefaultSource).when(source).thenReturn(source == expectedSource);
+            sourceQueriesMock(&Domain::DataSourceQueries::isDefaultSource).when(source).thenReturn(source == expectedSource);
         }
 
         auto projectQueries = Domain::ProjectQueries::Ptr();
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
+        auto taskRepository = Domain::TaskRepository::Ptr();
         auto noteRepository = Domain::NoteRepository::Ptr();
         auto tagQueries = Domain::TagQueries::Ptr();
         auto tagRepository = Domain::TagRepository::Ptr();
@@ -144,7 +144,7 @@
                                                sourceQueriesMock.getInstance(),
                                                sourceRepository,
                                                taskQueries,
-                                               taskRepositoryMock.getInstance(),
+                                               taskRepository,
                                                noteRepository,
                                                tagQueries,
                                                tagRepository);
@@ -154,7 +154,7 @@
 
         // THEN
         QCOMPARE(source, expectedSource);
-        QVERIFY(taskRepositoryMock(&Domain::TaskRepository::isDefaultSource).when(expectedSource).exactly(1));
+        QVERIFY(sourceQueriesMock(&Domain::DataSourceQueries::isDefaultSource).when(expectedSource).exactly(1));
     }
 
     void shouldGiveFirstTaskCollectionAsDefaultIfNoneMatched()
@@ -173,19 +173,17 @@
         Utils::MockObject<Domain::DataSourceQueries> sourceQueriesMock;
         sourceQueriesMock(&Domain::DataSourceQueries::findNotes).when().thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
         sourceQueriesMock(&Domain::DataSourceQueries::findTasks).when().thenReturn(sourceResult);
-
-        // Repository mock returning the data source as default
-        Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
         foreach (const Domain::DataSource::Ptr &source, provider->data()) {
-            taskRepositoryMock(&Domain::TaskRepository::isDefaultSource).when(source).thenReturn(false);
+            sourceQueriesMock(&Domain::DataSourceQueries::isDefaultSource).when(source).thenReturn(false);
         }
 
         auto projectQueries = Domain::ProjectQueries::Ptr();
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
+        auto taskRepository = Domain::TaskRepository ::Ptr();
         auto noteRepository = Domain::NoteRepository::Ptr();
         auto tagQueries = Domain::TagQueries::Ptr();
         auto tagRepository = Domain::TagRepository::Ptr();
@@ -196,7 +194,7 @@
                                                sourceQueriesMock.getInstance(),
                                                sourceRepository,
                                                taskQueries,
-                                               taskRepositoryMock.getInstance(),
+                                               taskRepository,
                                                noteRepository,
                                                tagQueries,
                                                tagRepository);
@@ -221,15 +219,13 @@
         sourceQueriesMock(&Domain::DataSourceQueries::findNotes).when().thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
         sourceQueriesMock(&Domain::DataSourceQueries::findTasks).when().thenReturn(sourceResult);
 
-        // Repository mock returning the data source as default
-        Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
-
         auto projectQueries = Domain::ProjectQueries::Ptr();
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
+        auto taskRepository = Domain::TaskRepository::Ptr();
         auto noteRepository = Domain::NoteRepository::Ptr();
         auto tagQueries = Domain::TagQueries::Ptr();
         auto tagRepository = Domain::TagRepository::Ptr();
@@ -240,7 +236,7 @@
                                                sourceQueriesMock.getInstance(),
                                                sourceRepository,
                                                taskQueries,
-                                               taskRepositoryMock.getInstance(),
+                                               taskRepository,
                                                noteRepository,
                                                tagQueries,
                                                tagRepository);
@@ -252,7 +248,7 @@
         QVERIFY(source.isNull());
     }
 
-    void shouldForwardDefaultTaskCollectionToRepository()
+    void shouldForwardDefaultTaskCollectionToQueries()
     {
         // GIVEN
 
@@ -267,17 +263,16 @@
         Utils::MockObject<Domain::DataSourceQueries> sourceQueriesMock;
         sourceQueriesMock(&Domain::DataSourceQueries::findNotes).when().thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
         sourceQueriesMock(&Domain::DataSourceQueries::findTasks).when().thenReturn(sourceResult);
-
-        // Repository mock setting the default data source
-        Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
-        taskRepositoryMock(&Domain::TaskRepository::setDefaultSource).when(source).thenReturn();
+        sourceQueriesMock(&Domain::DataSourceQueries::isDefaultSource).when(source).thenReturn(false);
+        sourceQueriesMock(&Domain::DataSourceQueries::changeDefaultSource).when(source).thenReturn();
 
         auto projectQueries = Domain::ProjectQueries::Ptr();
         auto projectRepository = Domain::ProjectRepository::Ptr();
         auto contextQueries = Domain::ContextQueries::Ptr();
         auto contextRepository = Domain::ContextRepository::Ptr();
         auto sourceRepository = Domain::DataSourceRepository::Ptr();
         auto taskQueries = Domain::TaskQueries::Ptr();
+        auto taskRepository = Domain::TaskRepository::Ptr();
         auto noteRepository = Domain::NoteRepository::Ptr();
         auto tagQueries = Domain::TagQueries::Ptr();
         auto tagRepository = Domain::TagRepository::Ptr();
@@ -288,7 +283,7 @@
                                                sourceQueriesMock.getInstance(),
                                                sourceRepository,
                                                taskQueries,
-                                               taskRepositoryMock.getInstance(),
+                                               taskRepository,
                                                noteRepository,
                                                tagQueries,
                                                tagRepository);
@@ -298,7 +293,7 @@
         app.setDefaultDataSource(source);
 
         // THEN
-        QVERIFY(taskRepositoryMock(&Domain::TaskRepository::setDefaultSource).when(source).exactly(1));
+        QVERIFY(sourceQueriesMock(&Domain::DataSourceQueries::changeDefaultSource).when(source).exactly(1));
     }
 };