diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspectUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspectUnitTest.java
index e94f2ad103..8a323d794b 100644
--- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspectUnitTest.java
+++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspectUnitTest.java
@@ -43,6 +43,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
 import org.alfresco.module.org_alfresco_module_rm.util.TransactionalResourceHelper;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -165,7 +166,7 @@ public class FrozenAspectUnitTest
     /**
      * Test before delete throws an error if a node is frozen
      */
-    @Test(expected = AccessDeniedException.class)
+    @Test(expected = PermissionDeniedException.class)
     public void testBeforeDeleteNodeThrowsExceptionIfNodeFrozen()
     {
         when(mockFreezeService.isFrozen(content)).thenReturn(true);
@@ -186,7 +187,7 @@ public class FrozenAspectUnitTest
     /**
      * Test before delete throws an error for a node with frozen children
      */
-    @Test (expected = AccessDeniedException.class)
+    @Test (expected = PermissionDeniedException.class)
     public void testBeforeDeleteThrowsExceptionForFrozenChild()
     {
         when(mockChildRef.getChildRef()).thenReturn(child);
@@ -225,22 +226,22 @@ public class FrozenAspectUnitTest
     }
 
     /**
-     * Test on move throws an error for a frozen node
+     * Test before move throws an error for a frozen node
      */
-    @Test(expected = AccessDeniedException.class)
-    public void testOnMoveThrowsExceptionForFrozenNode()
+    @Test(expected = PermissionDeniedException.class)
+    public void testBeforeMoveThrowsExceptionForFrozenNode()
     {
-        when(mockNewRef.getParentRef()).thenReturn(parent);
-        when(mockNewRef.getChildRef()).thenReturn(child);
-        when(mockNodeService.exists(parent)).thenReturn(true);
+        when(mockOldRef.getParentRef()).thenReturn(parent);
+        when(mockOldRef.getChildRef()).thenReturn(child);
         when(mockNodeService.exists(child)).thenReturn(true);
-        frozenAspect.onMoveNode(mockOldRef, mockNewRef);
+        when(mockFreezeService.isFrozen(child)).thenReturn(true);
+        frozenAspect.beforeMoveNode(mockOldRef, null);
     }
 
     /**
      * Test update properties throws an error for frozen nodes
      */
-    @Test(expected = AccessDeniedException.class)
+    @Test(expected = PermissionDeniedException.class)
     public void testUpdatePropertiesThrowsExceptionForFrozenNode()
     {
         when(mockFreezeService.isFrozen(content)).thenReturn(true);
@@ -248,24 +249,4 @@ public class FrozenAspectUnitTest
         when(mockSet.contains("frozen")).thenReturn(false);
         frozenAspect.onUpdateProperties(content, null, null);
     }
-
-    /**
-     * Test on content update throws an error for frozen nodes
-     */
-    @Test(expected = AccessDeniedException.class)
-    public void testOnContentUpdateThrowsExceptionForFrozenNode()
-    {
-        when(mockFreezeService.isFrozen(content)).thenReturn(true);
-        frozenAspect.onContentUpdate(content, false);
-    }
-
-    /**
-     * Test before copy throws an error for frozen node
-     */
-    @Test(expected = AccessDeniedException.class)
-    public void testBeforeCopyThrowsExceptionForFrozenNode()
-    {
-        when(mockFreezeService.isFrozen(content)).thenReturn(true);
-        frozenAspect.beforeCopy(null, content, null);
-    }
 }