diff --git a/src/core/datastore/persisters/browser/browser-key-value-persister.js b/src/core/datastore/persisters/browser/browser-key-value-persister.js
index 9aac18428..599396edf 100644
--- a/src/core/datastore/persisters/browser/browser-key-value-persister.js
+++ b/src/core/datastore/persisters/browser/browser-key-value-persister.js
@@ -33,7 +33,7 @@ export class BrowserKeyValuePersister extends KeyValuePersister {
 
   _writeToPersistance(collection, entities) {
     return this._ensureCollectionExists(collection)
-      .then(() => this._deserializeAndSet(collection, entities));
+      .then(() => this._serializeAndSet(collection, entities));
   }
 
   _deleteFromPersistance(collection) {
@@ -57,11 +57,11 @@ export class BrowserKeyValuePersister extends KeyValuePersister {
           return Promise.resolve();
         }
         allCollections.push(collection);
-        return this._deserializeAndSet(masterCollectionName, allCollections);
+        return this._serializeAndSet(masterCollectionName, allCollections);
       });
   }
 
-  _deserializeAndSet(collection, entities) {
+  _serializeAndSet(collection, entities) {
     return this._serialize(entities)
       .then(serialized => this._store.setItem(collection, serialized));
   }
diff --git a/src/core/datastore/persisters/browser/indexeddb-key-value-store-persister.js b/src/core/datastore/persisters/browser/indexeddb-key-value-store-persister.js
index b9e7e6a3d..6ad5152f6 100644
--- a/src/core/datastore/persisters/browser/indexeddb-key-value-store-persister.js
+++ b/src/core/datastore/persisters/browser/indexeddb-key-value-store-persister.js
@@ -113,8 +113,7 @@ export class IndexedDbKeyValueStorePersister extends KeyValueStorePersister {
         };
 
         txn.onerror = () => {
-          reject(new NotFoundError(`An entity with id = ${entityId} was not found in the ${collection}`
-            + ` collection on the ${this._storeName} IndexedDB database.`));
+          reject(this._getEntityNotFoundError(collection, entityId));
         };
       }, reject);
     });
diff --git a/src/core/datastore/persisters/key-value-store-persister.js b/src/core/datastore/persisters/key-value-store-persister.js
index efc38c148..869bb6cf7 100644
--- a/src/core/datastore/persisters/key-value-store-persister.js
+++ b/src/core/datastore/persisters/key-value-store-persister.js
@@ -60,6 +60,6 @@ export class KeyValueStorePersister extends KeyValuePersister {
 
   _getEntityNotFoundError(collection, id) {
     return new NotFoundError(`An entity with _id = ${id} was not found in the ${collection}`
-      + ` collection on the ${this._storeName} IndexedDB database.`);
+      + ` collection on the ${this._storeName} database.`);
   }
 }
diff --git a/src/core/datastore/repositories/repository-provider.js b/src/core/datastore/repositories/repository-provider.js
index d3b8f1cd6..5d8f1bc10 100644
--- a/src/core/datastore/repositories/repository-provider.js
+++ b/src/core/datastore/repositories/repository-provider.js
@@ -9,8 +9,7 @@ import { StorageProvider } from './storage-provider';
 import { ensureArray } from '../../utils';
 import { PromiseQueueByKey } from '../utils';
 import { MemoryKeyValuePersister } from '../persisters';
-
-const testSupportCollection = '__testSupport__';
+import { testSupportCollection } from './utils';
 
 const inmemoryRepoBuilder = (queue) => {
   const persister = new MemoryKeyValuePersister();
diff --git a/src/core/datastore/repositories/utils.js b/src/core/datastore/repositories/utils.js
index 2d41abcd6..3c2b1259e 100644
--- a/src/core/datastore/repositories/utils.js
+++ b/src/core/datastore/repositories/utils.js
@@ -2,6 +2,8 @@ import { Client } from '../../client';
 
 import { stripTagFromCollectionName } from '../utils';
 
+export const testSupportCollection = '__testSupport__';
+
 export function buildCollectionUrl(collectionName, id, restAction) {
   collectionName = stripTagFromCollectionName(collectionName);
   let result = `appdata/${Client.sharedInstance().appKey}/${collectionName}`;
diff --git a/src/core/datastore/sync/sync-manager.js b/src/core/datastore/sync/sync-manager.js
index 700c23311..b5771e5a9 100644
--- a/src/core/datastore/sync/sync-manager.js
+++ b/src/core/datastore/sync/sync-manager.js
@@ -72,7 +72,6 @@ export class SyncManager {
       return Promise.reject(new KinveyError('Invalid or missing collection name'));
     }
 
-    // TODO: decide on default value of pagination setting
     if (options && (options.autoPagination && !options.useDeltaFetch)) {
       return this._paginatedPull(collection, query, options);
     }
@@ -291,7 +290,6 @@ export class SyncManager {
   }
 
   _fetchItemsFromServer(collection, query, options) {
-    // TODO: deltaset logic goes here
     return this._networkRepo.read(collection, query, options);
   }