diff --git a/gradle.properties b/gradle.properties
index 629542da45..9b69472e36 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,21 @@
+# build details
 groupid=alfresco
 packageName=rm
 version=2.1.0
 build=dev
 
+# maven urls's
 alfrescoMavenUrl=https://artifacts.alfresco.com/nexus/content/groups/public/
 alfrescoEnterpriseMavenUrl=https://artifacts.alfresco.com/nexus/content/groups/internal
+
+# set credentials for protected maven repo or pass on command line:
+#   -PalfrescoEnterpriseMavenUser=userName -PalfrescoEnterpriseMavenPwd=password
 alfrescoEnterpriseMavenUser=
 alfrescoEnterpriseMavenPwd=
 
 # set to org.alfresco.enterprise when enterprise version required
 alfrescoGroupId=org.alfresco
 alfrescoBaseVersion=4.2-SHOULDERS-build5
+
+# indicates whether this is a local build or not
+localBuild=true
diff --git a/rm-server/build.gradle b/rm-server/build.gradle
index b696c4e55f..d9ef8e6aa0 100644
--- a/rm-server/build.gradle
+++ b/rm-server/build.gradle
@@ -81,7 +81,7 @@ test {
 	}
 
 	scanForTestClasses = false
-	include '**/*ActionTestSuite.class'
+	include '**/AllTestSuite.class'
 
 	testLogging.showStandardStreams = true
 	jvmArgs '-Xms256M', '-Xmx1024M', '-XX:MaxPermSize=256M'
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java
index 10dca84f33..64ba7467a8 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java
@@ -22,8 +22,6 @@ import org.alfresco.module.org_alfresco_module_rm.test.action.CreateRecordAction
 import org.alfresco.module.org_alfresco_module_rm.test.action.FileToActionTest;
 import org.alfresco.module.org_alfresco_module_rm.test.action.HideRecordActionTest;
 import org.alfresco.module.org_alfresco_module_rm.test.action.RejectActionTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.ExtendedActionServiceTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementActionServiceImplTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -38,8 +36,6 @@ import org.junit.runners.Suite.SuiteClasses;
 @RunWith(Suite.class)
 @SuiteClasses(
 {
-    RecordsManagementActionServiceImplTest.class,
-    ExtendedActionServiceTest.class,
     CreateRecordActionTest.class,
     HideRecordActionTest.class,
     RejectActionTest.class,
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
new file mode 100644
index 0000000000..fb84ea4eae
--- /dev/null
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.test;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * Convenience test suite that runs all the tests.
+ *
+ * @author Roy Wetherall
+ * @since 2.1
+ */
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+    ActionTestSuite.class,
+    CapabilitiesTestSuite.class,
+    ServicesTestSuite.class,
+    WebScriptTestSuite.class
+})
+public class AllTestSuite
+{
+}
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
index 8afdbbe829..60ca4a73e1 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
@@ -18,11 +18,11 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.test;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.alfresco.module.org_alfresco_module_rm.test.capabilities.CompositeCapabilityTest;
 import org.alfresco.module.org_alfresco_module_rm.test.capabilities.DeclarativeCapabilityTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 
 /**
@@ -30,18 +30,12 @@ import org.alfresco.module.org_alfresco_module_rm.test.capabilities.DeclarativeC
  * 
  * @author Roy Wetherall
  */
-public class CapabilitiesTestSuite extends TestSuite
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+    DeclarativeCapabilityTest.class,
+    CompositeCapabilityTest.class
+})
+public class CapabilitiesTestSuite
 {
-    /**
-     * Creates the test suite
-     * 
-     * @return  the test suite
-     */
-    public static Test suite() 
-    {
-        TestSuite suite = new TestSuite();
-        suite.addTestSuite(DeclarativeCapabilityTest.class);
-        suite.addTestSuite(CompositeCapabilityTest.class);
-        return suite;
-    }
 }
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
index a36081ea16..8797624568 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
@@ -18,12 +18,10 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.test;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.alfresco.module.org_alfresco_module_rm.test.service.CapabilityServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.DataSetServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.DispositionServiceImplTest;
+import org.alfresco.module.org_alfresco_module_rm.test.service.ExtendedActionServiceTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.ExtendedSecurityServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.FilePlanRoleServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.FilePlanServiceImplTest;
@@ -34,8 +32,10 @@ import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagement
 import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementAdminServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementAuditServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementSearchServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.VitalRecordServiceImplTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 
 /**
@@ -43,32 +43,27 @@ import org.alfresco.module.org_alfresco_module_rm.test.service.VitalRecordServic
  *
  * @author Roy Wetherall
  */
-public class ServicesTestSuite extends TestSuite
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+    ExtendedSecurityServiceImplTest.class,
+    ModelSecurityServiceImplTest.class,
+    RecordsManagementActionServiceImplTest.class,
+    ExtendedActionServiceTest.class,
+    DispositionServiceImplTest.class,
+    RecordsManagementActionServiceImplTest.class,
+    RecordsManagementAdminServiceImplTest.class,
+    RecordsManagementAuditServiceImplTest.class,
+    //RecordsManagementEventServiceImplTest.class,
+    RecordsManagementSearchServiceImplTest.class,
+    VitalRecordServiceImplTest.class,
+    DataSetServiceImplTest.class,
+    FreezeServiceImplTest.class,
+    RecordServiceImplTest.class,
+    CapabilityServiceImplTest.class,
+    FilePlanRoleServiceImplTest.class,
+    FilePlanServiceImplTest.class
+})
+public class ServicesTestSuite 
 {
-    /**
-     * Creates the test suite
-     *
-     * @return  the test suite
-     */
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite();
-        suite.addTestSuite(ExtendedSecurityServiceImplTest.class);
-        suite.addTestSuite(ModelSecurityServiceImplTest.class);
-        suite.addTestSuite(RecordsManagementServiceImplTest.class);
-        suite.addTestSuite(DispositionServiceImplTest.class);
-        suite.addTestSuite(RecordsManagementActionServiceImplTest.class);
-        suite.addTestSuite(RecordsManagementAdminServiceImplTest.class);
-        suite.addTestSuite(RecordsManagementAuditServiceImplTest.class);
-        //suite.addTestSuite(RecordsManagementEventServiceImplTest.class);
-        suite.addTestSuite(RecordsManagementSearchServiceImplTest.class);
-        suite.addTestSuite(VitalRecordServiceImplTest.class);
-        suite.addTestSuite(DataSetServiceImplTest.class);
-        suite.addTestSuite(FreezeServiceImplTest.class);
-        suite.addTestSuite(RecordServiceImplTest.class);
-        suite.addTestSuite(CapabilityServiceImplTest.class);
-        suite.addTestSuite(FilePlanRoleServiceImplTest.class);
-        suite.addTestSuite(FilePlanServiceImplTest.class);
-        return suite;
-    }
 }
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
index 9df5f0cc85..04f9ccbdc6 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java
@@ -18,9 +18,6 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.test;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.ActionDefinitionsRestApiTest;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.CapabilitiesRestApiTest;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.DataSetRestApiTest;
@@ -30,10 +27,10 @@ import org.alfresco.module.org_alfresco_module_rm.test.webscript.EmailMapScriptT
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.EventRestApiTest;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.RMCaveatConfigScriptTest;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.RMConstraintScriptTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RmClassesRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RmPropertiesRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RmRestApiTest;
 import org.alfresco.module.org_alfresco_module_rm.test.webscript.RoleRestApiTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 
 /**
@@ -41,29 +38,24 @@ import org.alfresco.module.org_alfresco_module_rm.test.webscript.RoleRestApiTest
  *
  * @author Roy Wetherall
  */
-public class WebScriptTestSuite extends TestSuite
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+    DispositionRestApiTest.class,
+    EventRestApiTest.class,
+    RMCaveatConfigScriptTest.class,
+    RMConstraintScriptTest.class,
+    //RmRestApiTest.class,
+    RoleRestApiTest.class,
+    DataSetRestApiTest.class,
+    EmailMapScriptTest.class,
+    EmailMapKeysRestApiTest.class,
+    CapabilitiesRestApiTest.class,
+    ActionDefinitionsRestApiTest.class
+    //RmClassesRestApiTest.class,
+    //RmPropertiesRestApiTest.class
+
+})
+public class WebScriptTestSuite
 {
-    /**
-     * Creates the test suite
-     *
-     * @return  the test suite
-     */
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite();
-        suite.addTestSuite(DispositionRestApiTest.class);
-        suite.addTestSuite(EventRestApiTest.class);
-        suite.addTestSuite(RMCaveatConfigScriptTest.class);
-        suite.addTestSuite(RMConstraintScriptTest.class);
-        suite.addTestSuite(RmRestApiTest.class);
-        suite.addTestSuite(RoleRestApiTest.class);
-        suite.addTestSuite(DataSetRestApiTest.class);
-        suite.addTestSuite(EmailMapScriptTest.class);
-        suite.addTestSuite(EmailMapKeysRestApiTest.class);
-        suite.addTestSuite(CapabilitiesRestApiTest.class);
-        suite.addTestSuite(ActionDefinitionsRestApiTest.class);
-        suite.addTestSuite(RmClassesRestApiTest.class);
-        suite.addTestSuite(RmPropertiesRestApiTest.class);
-        return suite;
-    }
 }
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java
index 924e955e60..ab295efaec 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java
@@ -26,6 +26,7 @@ import org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestCase;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.GUID;
 import org.alfresco.util.PropertyMap;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -419,7 +420,7 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase
             JSONObject obj = new JSONObject();
             obj.put("allowedValues", array);
             obj.put("constraintName", RM_LIST);
-            obj.put("constraintTitle", "this is the title");
+            obj.put("constraintTitle", GUID.generate());
         
             System.out.println(obj.toString());
         
@@ -458,7 +459,7 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase
          * Now a constraint with a generated name
          */
         {
-            String title = "Generated title list";
+            String title = GUID.generate();
             JSONArray array = new JSONArray();
             array.put("Red");
             array.put("Blue");
@@ -506,7 +507,7 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase
             JSONObject obj = new JSONObject();
             obj.put("allowedValues", array);
             obj.put("constraintName", "rmc_whazoo");
-            obj.put("constraintTitle", "this is the title");
+            obj.put("constraintTitle", GUID.generate());
         
             System.out.println(obj.toString());