diff --git a/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java b/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java
index 9e9f781a6b..eefa0d2213 100644
--- a/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java
+++ b/source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java
@@ -164,10 +164,13 @@ public class AbstractWCMServiceImplTest extends TestCase
     
     protected void createUser(String userName)
     {
-        if (authenticationService.authenticationExists(userName) == false)
+        if (! authenticationService.authenticationExists(userName))
         {
             authenticationService.createAuthentication(userName, "PWD".toCharArray());
-            
+        }
+        
+        if (! personService.personExists(userName))
+        {
             PropertyMap ppOne = new PropertyMap(4);
             ppOne.put(ContentModel.PROP_USERNAME, userName);
             ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
diff --git a/source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java b/source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java
index 3acd2183ee..7f52dcb18f 100644
--- a/source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java
+++ b/source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java
@@ -399,7 +399,7 @@ public class AssetServiceImplTest extends AbstractWCMServiceImplTest
             writer.putContent(FILE);
         }
         
-        sbService.submitWebApp(sbStoreId, defaultWebApp, "some existing folders and files", null);
+        sbService.submitWebApp(sbStoreId, defaultWebApp, "some existing folders and files", "some existing folders and files");
         
         pollForSnapshotCount(stagingStoreId, 1);
         
@@ -666,11 +666,18 @@ public class AssetServiceImplTest extends AbstractWCMServiceImplTest
         // switch to user
         AuthenticationUtil.setFullyAuthenticatedUser(user);
         
-        // submit the changes
-        sbService.submitWebApp(sbStoreId, defaultWebApp, "some updates by "+user, null);
-
-        snapCnt += (canUpdateExisting || canDeleteExisting) ? (1):(0);
-        pollForSnapshotCount(stagingStoreId, snapCnt);
+        List<AssetInfo> changedAssets = sbService.listChangedWebApp(sbStoreId, defaultWebApp, true);
+        
+        if (changedAssets.size() > 0)
+        {
+            // submit the changes
+            sbService.submitWebApp(sbStoreId, defaultWebApp, "some updates by "+user, "some updates by "+user);
+            
+            snapCnt += (canUpdateExisting || canDeleteExisting) ? (1):(0);
+            pollForSnapshotCount(stagingStoreId, snapCnt);
+            
+            assertEquals(0, sbService.listChangedWebApp(sbStoreId, defaultWebApp, true).size());
+        }
     }
     
     public void testRenameFile()