diff --git a/services/document-updater/app/coffee/PersistenceManager.coffee b/services/document-updater/app/coffee/PersistenceManager.coffee
index 6ac999629a..4b084f1574 100644
--- a/services/document-updater/app/coffee/PersistenceManager.coffee
+++ b/services/document-updater/app/coffee/PersistenceManager.coffee
@@ -3,6 +3,7 @@ Settings = require "settings-sharelatex"
 Errors = require "./Errors"
 Metrics = require "./Metrics"
 {db, ObjectId} = require("./mongojs")
+logger = require "logger-sharelatex"
 
 module.exports = PersistenceManager =
 	getDoc: (project_id, doc_id, callback = (error, lines, version) ->) ->
@@ -11,6 +12,7 @@ module.exports = PersistenceManager =
 			if version?
 				callback null, lines, version
 			else
+				logger.warn project_id: project_id, doc_id: doc_id, "loading doc version from mongo - deprecated"
 				PersistenceManager.getDocVersionInMongo doc_id, (error, version) ->
 					return callback(error) if error?
 					if version?
diff --git a/services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee b/services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee
index 019f32bc74..ffed682321 100644
--- a/services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee
+++ b/services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee
@@ -5,7 +5,7 @@ modulePath = path.join __dirname, '../../../app/js/RedisManager.js'
 keys = require(path.join __dirname, '../../../app/js/RedisKeyBuilder.js')
 project_id = 1234
 doc_id     = 5678
-loadModule = require('./module-loader').loadModule
+SandboxedModule = require('sandboxed-module')
 
 describe 'putting a doc into memory', ()->
 	lines = ["this is one line", "and another line"]
@@ -44,7 +44,7 @@ describe 'putting a doc into memory', ()->
 					exec:(callback)->
 						callback()
 	
-	redisManager = loadModule(modulePath, mocks).module.exports
+	redisManager = SandboxedModule.require(modulePath, requires: mocks)
 
 	it 'should put a all data into memory', (done)->
 		redisManager.putDocInMemory project_id, doc_id, lines, version, ()->
diff --git a/services/document-updater/test/unit/coffee/DocOpsManager/DocOpsManagerTests.coffee b/services/document-updater/test/unit/coffee/DocOpsManager/DocOpsManagerTests.coffee
index 6f6094c855..a215b0ccd4 100644
--- a/services/document-updater/test/unit/coffee/DocOpsManager/DocOpsManagerTests.coffee
+++ b/services/document-updater/test/unit/coffee/DocOpsManager/DocOpsManagerTests.coffee
@@ -3,6 +3,7 @@ chai = require('chai')
 should = chai.should()
 modulePath = "../../../../app/js/DocOpsManager.js"
 SandboxedModule = require('sandboxed-module')
+{ObjectId} = require "mongojs"
 
 describe "DocOpsManager", ->
 	beforeEach ->
diff --git a/services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee b/services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee
index cb98e8f601..14f81f6052 100644
--- a/services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee
+++ b/services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee
@@ -3,7 +3,7 @@ should = require('chai').should()
 path = require('path')
 modulePath = path.join __dirname, '../../../app/js/RedisManager.js'
 _ = require('underscore')
-loadModule = require('./module-loader').loadModule
+SandboxedModule = require('sandboxed-module')
 keys = require(path.join __dirname, '../../../app/js/RedisKeyBuilder.js')
 
 describe 'getting entire list of pending updates', ()->
@@ -33,7 +33,7 @@ describe 'getting entire list of pending updates', ()->
 					exec: (callback)->
 						callback(null, redisReturn)
 	
-	redisManager = loadModule(modulePath, mocks).module.exports
+	redisManager = SandboxedModule.require(modulePath, requires: mocks)
 
 	it 'should have 3 elements in array', (done)->
 		redisManager.getPendingUpdatesForDoc doc_id, (err, listOfUpdates)->
diff --git a/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee b/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee
index ae4af4825d..3b4f449f94 100644
--- a/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee
+++ b/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee
@@ -4,7 +4,7 @@ should = require('chai').should()
 path = require('path')
 modulePath = path.join __dirname, '../../../app/js/RedisManager.js'
 keys = require(path.join __dirname, '../../../app/js/RedisKeyBuilder.js')
-loadModule = require('./module-loader').loadModule
+SandboxedModule = require('sandboxed-module')
 
 describe 'getting cound of docs from memory', ()->
 
@@ -35,7 +35,7 @@ describe 'getting cound of docs from memory', ()->
 						exec:(callback)->
 							callback()
 		
-		redisManager = loadModule(modulePath, mocks).module.exports
+		redisManager = SandboxedModule.require(modulePath, requires: mocks)
 		redisManager.putDocInMemory project_id, doc_id1, 0, ["line"], ->
 			redisManager.putDocInMemory project_id, doc_id2, 0, ["ledf"], ->
 				redisManager.putDocInMemory project_id, doc_id3, 0, ["ledf"], ->
diff --git a/services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee b/services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee
index ac72cbae93..fe744d2379 100644
--- a/services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee
+++ b/services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee
@@ -7,7 +7,7 @@ keys = require(path.join __dirname, '../../../../app/js/RedisKeyBuilder.js')
 project_id = 1234
 doc_id     = 5678
 blockingKey = "Blocking:#{doc_id}"
-loadModule = require('../module-loader').loadModule
+SandboxedModule = require('sandboxed-module')
 
 describe 'Lock Manager - checking the lock', ()->
 
@@ -27,7 +27,7 @@ describe 'Lock Manager - checking the lock', ()->
 					expire: exireStub
 					set: setStub
 					exec: execStub
-	LockManager = loadModule(modulePath, mocks).module.exports
+	LockManager = SandboxedModule.require(modulePath, requires: mocks)
 
 	it 'should check if lock exists but not set or expire', (done)->
 		execStub.callsArgWith(0, null, ["1"])
diff --git a/services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee b/services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee
index 81f42a3f59..39f16b09b9 100644
--- a/services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee
+++ b/services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee
@@ -6,7 +6,7 @@ modulePath = path.join __dirname, '../../../../app/js/LockManager.js'
 keys = require(path.join __dirname, '../../../../app/js/RedisKeyBuilder.js')
 project_id = 1234
 doc_id     = 5678
-loadModule = require('../module-loader').loadModule
+SandboxedModule = require('sandboxed-module')
 
 describe 'LockManager - releasing the lock', ()->
 
@@ -19,7 +19,7 @@ describe 'LockManager - releasing the lock', ()->
 				auth:->
 				del:deleteStub
 	
-	LockManager = loadModule(modulePath, mocks).module.exports
+	LockManager = SandboxedModule.require(modulePath, requires: mocks)
 
 	it 'should put a all data into memory', (done)->
 		LockManager.releaseLock doc_id, ->
diff --git a/services/document-updater/test/unit/coffee/PersistenceManager/getDocTests.coffee b/services/document-updater/test/unit/coffee/PersistenceManager/getDocTests.coffee
index 50ba0984ac..5b4efe402f 100644
--- a/services/document-updater/test/unit/coffee/PersistenceManager/getDocTests.coffee
+++ b/services/document-updater/test/unit/coffee/PersistenceManager/getDocTests.coffee
@@ -13,6 +13,7 @@ describe "PersistenceManager.getDoc", ->
 			"./Metrics": @Metrics =
 				Timer: class Timer
 					done: sinon.stub()
+			"logger-sharelatex": @logger = {warn: sinon.stub()}
 			"./mongojs":
 				db: @db = { docOps: {} }
 				ObjectId: ObjectId
@@ -52,6 +53,11 @@ describe "PersistenceManager.getDoc", ->
 				.calledWith(@doc_id)
 				.should.equal true
 
+		it "shoud log a warning", ->
+			@logger.warn
+				.calledWith(project_id: @project_id, doc_id: @doc_id, "loading doc version from mongo - deprecated")
+				.should.equal true
+
 		it "should call the callback with the lines and version", ->
 			@callback.calledWith(null, @lines, @version).should.equal true
 
diff --git a/services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee b/services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee
index 9fd0136aad..be18d41c57 100644
--- a/services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee
+++ b/services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee
@@ -5,7 +5,7 @@ sinon = require('sinon')
 path = require('path')
 modulePath = path.join __dirname, '../../../app/js/RedisManager.js'
 keys = require(path.join __dirname, '../../../app/js/RedisKeyBuilder.js')
-loadModule = require('./module-loader').loadModule
+SandboxedModule = require('sandboxed-module')
 
 describe 'removing single doc from memory', ()->
 
@@ -43,7 +43,7 @@ describe 'removing single doc from memory', ()->
 						exec:(callback)->
 							callback(null, [])
 		
-		redisManager = loadModule(modulePath, mocks).module.exports
+		redisManager = SandboxedModule.require(modulePath, requires: mocks)
 		redisManager.putDocInMemory project_id, doc_id1, 0, ["line"], ->
 			redisManager.putDocInMemory project_id, doc_id2, 0, ["ledf"], ->
 				redisManager.putDocInMemory project_id, doc_id3, 0, ["ledf"], ->