diff --git a/platform/entanglement/src/services/CopyService.js b/platform/entanglement/src/services/CopyService.js
index d97ec4677b..025a5fda08 100644
--- a/platform/entanglement/src/services/CopyService.js
+++ b/platform/entanglement/src/services/CopyService.js
@@ -88,10 +88,13 @@ define(
              */
             function copy(originalObject, originalParent) {
                 //Make a clone of the model of the object to be copied
-                var modelClone = makeClone(originalObject.getModel());
-                delete modelClone.composition;
-                delete modelClone.location;
-                modelClone.id = uuid();
+                var modelClone = {
+                        id: uuid(),
+                        model: makeClone(originalObject.getModel()),
+                        persistenceSpace: originalParent.getCapability('persistence')
+                    }
+                delete modelClone.model.composition;
+                delete modelClone.model.location;
                 return $q.when(originalObject.useCapability('composition')).then(function(composees){
                     return (composees || []).reduce(function(promise, composee){
                             //If the object is composed of other
@@ -101,18 +104,15 @@ define(
                                 return copy(composee, originalObject).then(function(composeeClone){
                                     //Once copied, associate each cloned
                                     // composee with its parent clone
-                                    composeeClone.location = modelClone.id;
-                                    modelClone.composition = modelClone.composition || [];
-                                    return modelClone.composition.push(composeeClone.id);
+                                    composeeClone.model.location = modelClone.id;
+                                    modelClone.model.composition = modelClone.model.composition || [];
+                                    return modelClone.model.composition.push(composeeClone.id);
                                 });
                             });}, $q.when(undefined)
                     ).then(function (){
                             //Add the clone to the list of clones that will
                             //be returned by this function
-                            clones.push({
-                                model: modelClone,
-                                persistenceSpace: originalParent.getCapability('persistence')
-                            });
+                            clones.push(modelClone);
                             return modelClone;
                         });
                 });
@@ -136,11 +136,13 @@ define(
                 self = this;
             return function(objectClones) {
                 return self.$q.all(objectClones.map(function(clone, index){
-                    return self.persistenceService.createObject(clone.persistenceSpace, clone.model.id, clone.model)
+                    return self.persistenceService.createObject(clone.persistenceSpace, clone.id, clone.model)
                         .then(function(){
                             progress && progress("copying", objectClones.length, ++persisted);
                         });
-                })).then(function(){ return objectClones});
+                })).then(function(qall){ 
+                    return objectClones
+                });
             }
         }
 
@@ -161,8 +163,8 @@ define(
                 parentClone.model.location = parent.getId();
                 
                 return self.persistenceService
-                    .updateObject(parentClone.persistenceSpace, parentClone.model.id, parentClone.model)
-                    .then(function(){return parent.getCapability('composition').add(parentClone.model.id)})
+                    .updateObject(parentClone.persistenceSpace, parentClone.id, parentClone.model)
+                    .then(function(){return parent.getCapability('composition').add(parentClone.id)})
                     .then(function(){return parent.getCapability("persistence").persist()});
             }
         }
diff --git a/platform/entanglement/test/services/CopyServiceSpec.js b/platform/entanglement/test/services/CopyServiceSpec.js
index 2788fcefa8..7b58d3eab5 100644
--- a/platform/entanglement/test/services/CopyServiceSpec.js
+++ b/platform/entanglement/test/services/CopyServiceSpec.js
@@ -125,10 +125,12 @@ define(
                     creationService,
                     createObjectPromise,
                     copyService,
+                    mockPersistenceService,
                     object,
                     newParent,
                     copyResult,
-                    copyFinished;
+                    copyFinished,
+                    persistObjectPromise;
 
                 beforeEach(function () {
                     creationService = jasmine.createSpyObj(
@@ -138,6 +140,13 @@ define(
                     createObjectPromise = synchronousPromise(undefined);
                     creationService.createObject.andReturn(createObjectPromise);
                     policyService.allow.andReturn(true);
+                    
+                    mockPersistenceService = jasmine.createSpyObj(
+                        'persistenceService',
+                        ['createObject']
+                    );
+                    persistObjectPromise = synchronousPromise(undefined);
+                    mockPersistenceService.createObject.andReturn(persistObjectPromise);
                 });
 
                 describe("on domain object without composition", function () {
@@ -156,26 +165,32 @@ define(
                                 composition: []
                             }
                         });
-                        copyService = new CopyService(null, creationService, policyService);
+                        mockQ = jasmine.createSpyObj('mockQ', ['when', 'all', 'reject']);
+                        mockQ.when.andCallFake(synchronousPromise);
+                        mockQ.all.andCallFake(synchronousPromise);
+                        copyService = new CopyService(mockQ, creationService, policyService, mockPersistenceService);
                         copyResult = copyService.perform(object, newParent);
                         copyFinished = jasmine.createSpy('copyFinished');
                         copyResult.then(copyFinished);
                     });
 
-                    it("uses creation service", function () {
+                    /**
+                     * Test invalidated. Copy service no longer uses creation service.
+                     */
+                    /*it("uses creation service", function () {
                         expect(creationService.createObject)
                             .toHaveBeenCalledWith(jasmine.any(Object), newParent);
 
                         expect(createObjectPromise.then)
                             .toHaveBeenCalledWith(jasmine.any(Function));
-                    });
+                    });*/
 
                     it("deep clones object model", function () {
-                        var newModel = creationService
+                        //var newModel = creationService
+                        var newModel = mockPersistenceService
                             .createObject
                             .mostRecentCall
-                            .args[0];
-
+                            .args[2];
                         expect(newModel).toEqual(object.model);
                         expect(newModel).not.toBe(object.model);
                     });