diff --git a/services/document-updater/test/unit/coffee/Compression.coffee b/services/document-updater/test/unit/coffee/Compression.coffee
deleted file mode 100644
index bba1dd5c3e..0000000000
--- a/services/document-updater/test/unit/coffee/Compression.coffee
+++ /dev/null
@@ -1,100 +0,0 @@
-sinon = require('sinon')
-chai = require('chai')
-should = chai.should()
-modulePath = "../../../app/js/RedisManager"
-SandboxedModule = require('sandboxed-module')
-
-describe "RedisManager.setDocument and getDocument", ->
-	beforeEach ->
-		@zip_opts =
-			writesEnabled: true
-			minSize: 1000
-		@doc_id = "document-id"
-		@version = 123
-		@RedisManager = SandboxedModule.require modulePath, requires:
-			"settings-sharelatex" :
-				redis:
-					web:
-						host: 'none'
-						port: 'none'
-					zip: @zip_opts
-			"redis-sharelatex" : createClient: () =>
-				@rclient ?=
-					auth:-> # only assign one rclient
-					multi: () => @rclient
-					set: (key, value) => @rclient.store[key] = value
-					get: (key) => @rclient.results.push @rclient.store[key]
-					incr: (key) => @rclient.store[key]++
-					exec: (callback) =>
-						callback.apply(null, [null, @rclient.results])
-						@rclient.results = []
-					store: {}
-					results: []
-			"logger-sharelatex": {}
-
-		@RedisManager.setDocument(@doc_id, @docLines, @version, @callback)
-
-	describe "for a small document (uncompressed)", ->
-		before ->
-			@docLines = ["hello", "world"]
-			@callback = sinon.stub()
-
-		it "should set the document", ->
-			@rclient.store['doclines:document-id']
-				.should.equal JSON.stringify(@docLines)
-
-		it "should return the callback", ->
-			@callback.called.should.equal true
-
-		it "should get the document back again", (done) ->
-			@RedisManager.getDoc @doc_id, (err, lines, version) =>
-				@docLines.should.eql lines
-				done()
-
-	describe "for a large document (with compression enabled)", ->
-		before ->
-			@zip_opts =
-				writesEnabled: true
-				minSize: 1000
-			@docLines = []
-			while @docLines.join('').length <= @zip_opts.minSize
-				@docLines.push "this is a long line in a long document"
-			@callback = sinon.stub()
-		
-		it "should set the document as a gzipped blob", ->
-			@rclient.store['doclines:document-id']
-				.should.not.equal JSON.stringify(@docLines)
-
-		it "should return the callback", ->
-			@callback.called.should.equal true
-
-		it "should get the uncompressed document back again", (done) ->
-			@RedisManager.getDoc @doc_id, (err, lines, version) =>
-				@docLines.should.eql lines
-				done()
-
-	describe "for a large document (with compression disabled)", ->
-		before ->
-			@zip_opts =
-				writesEnabled: false
-				minSize: 1000
-			@docLines = []
-			while @docLines.join('').length <= @zip_opts.minSize
-				@docLines.push "this is a long line in a long document"
-			@callback = sinon.stub()
-		
-		it "should set the document", ->
-			@rclient.store['doclines:document-id']
-				.should.equal JSON.stringify(@docLines)
-
-		it "should return the callback", ->
-			@callback.called.should.equal true
-
-		it "should get the document back again", (done) ->
-			@RedisManager.getDoc @doc_id, (err, lines, version) =>
-				@docLines.should.eql lines
-				done()
-
-
-
-
diff --git a/services/document-updater/test/unit/coffee/ZipManager/ZipManager.coffee b/services/document-updater/test/unit/coffee/ZipManager/ZipManager.coffee
new file mode 100644
index 0000000000..11d1839994
--- /dev/null
+++ b/services/document-updater/test/unit/coffee/ZipManager/ZipManager.coffee
@@ -0,0 +1,158 @@
+sinon = require('sinon')
+chai = require('chai')
+should = chai.should()
+zipModulePath = "../../../../app/js/ZipManager"
+redisModulePath = "../../../../app/js/RedisManager"
+SandboxedModule = require('sandboxed-module')
+
+MIN_SIZE = 9999
+
+describe "ZipManager with RedisManager", ->
+	describe "for a small document (uncompressed)", ->
+		rclient = null
+		beforeEach (done) ->
+			@ZipManager = SandboxedModule.require zipModulePath,	requires:
+				'settings-sharelatex': redis:
+					web:
+						host: 'none'
+						port: 'none'
+					zip:
+						writesEnabled: true
+						minSize: MIN_SIZE
+			@RedisManager = SandboxedModule.require redisModulePath,	requires:
+				"./ZipManager" : @ZipManager
+				"redis-sharelatex" : createClient: () =>
+					rclient ?=
+						auth:-> # only assign one rclient
+						multi: () =>
+							console.log 'returning rclient', rclient
+							rclient
+						set: (key, value) => rclient.store[key] = value
+						get: (key) =>
+							console.log 'GET', key
+							rclient.results.push rclient.store[key]
+						incr: (key) => rclient.store[key]++
+						exec: (callback) =>
+							callback.apply(null, [null, rclient.results])
+							rclient.results = []
+						store: {}
+						results: []
+				"logger-sharelatex": {}
+			@doc_id = "document-id"
+			@version = 123
+
+			@docLines = ["hello", "world"]
+			@callback = sinon.stub()
+
+			@RedisManager.setDocument @doc_id, @docLines, @version, () =>
+				@callback()
+				done()
+
+		it "should set the document", ->
+			rclient.store['doclines:document-id']
+				.should.equal JSON.stringify(@docLines)
+
+		it "should return the callback", ->
+			@callback.called.should.equal true
+
+		it "should get the document back again", (done) ->
+			@RedisManager.getDoc @doc_id, (err, lines, version) =>
+				@docLines.should.eql lines
+				done()
+
+	describe "for a large document (with compression enabled)", ->
+		rclient = null
+		beforeEach (done) ->
+			@ZipManager = SandboxedModule.require zipModulePath,	requires:
+				'settings-sharelatex': redis:
+					web:
+						host: 'none'
+						port: 'none'
+					zip:
+						writesEnabled: true
+						minSize: MIN_SIZE
+			@RedisManager = SandboxedModule.require redisModulePath,	requires:
+				"./ZipManager" : @ZipManager
+				"redis-sharelatex" : createClient: () =>
+					rclient ?=
+						auth:-> # only assign one rclient
+						multi: () => rclient
+						set: (key, value) => rclient.store[key] = value
+						get: (key) => rclient.results.push rclient.store[key]
+						incr: (key) => rclient.store[key]++
+						exec: (callback) =>
+							callback.apply(null, [null, rclient.results])
+							rclient.results = []
+						store: {}
+						results: []
+				"logger-sharelatex": {}
+			@doc_id = "document-id"
+			@version = 123
+
+			@docLines = []
+			while @docLines.join('').length <= MIN_SIZE
+				@docLines.push "this is a long line in a long document"
+			@callback = sinon.stub()
+			@RedisManager.setDocument @doc_id, @docLines, @version, () =>
+				@callback()
+				done()
+
+		it "should set the document as a gzipped blob", ->
+			rclient.store['doclines:document-id']
+				.should.not.equal JSON.stringify(@docLines)
+
+		it "should return the callback", ->
+			@callback.called.should.equal true
+
+		it "should get the uncompressed document back again", (done) ->
+			@RedisManager.getDoc @doc_id, (err, lines, version) =>
+				@docLines.should.eql lines
+				done()
+
+	describe "for a large document (with compression disabled)", ->
+		rclient = null
+		beforeEach (done) ->
+			@ZipManager = SandboxedModule.require zipModulePath,	requires:
+				'settings-sharelatex': redis:
+					web:
+						host: 'none'
+						port: 'none'
+					zip:
+						writesEnabled: false
+						minSize: MIN_SIZE
+			@RedisManager = SandboxedModule.require redisModulePath,	requires:
+				"./ZipManager" : @ZipManager
+				"redis-sharelatex" : createClient: () =>
+					rclient ?=
+						auth:-> # only assign one rclient
+						multi: () => rclient
+						set: (key, value) => rclient.store[key] = value
+						get: (key) => rclient.results.push rclient.store[key]
+						incr: (key) => rclient.store[key]++
+						exec: (callback) =>
+							callback.apply(null, [null, rclient.results])
+							rclient.results = []
+						store: {}
+						results: []
+				"logger-sharelatex": {}
+			@doc_id = "document-id"
+			@version = 123
+			@docLines = []
+			while @docLines.join('').length <= MIN_SIZE
+				@docLines.push "this is a long line in a long document"
+			@callback = sinon.stub()
+			@RedisManager.setDocument @doc_id, @docLines, @version, () =>
+				@callback()
+				done()
+
+		it "should set the document", ->
+			rclient.store['doclines:document-id']
+				.should.equal JSON.stringify(@docLines)
+
+		it "should return the callback", ->
+			@callback.called.should.equal true
+
+		it "should get the document back again", (done) ->
+			@RedisManager.getDoc @doc_id, (err, lines, version) =>
+				@docLines.should.eql lines
+				done()