=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2014-04-28 12:39:27 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2014-05-13 08:13:16 +0000
@@ -600,15 +600,16 @@
     }
 
     /**
-     * @param categoryGroupUniqueIdentifier A unique character to identify the
+     * @param uniqueIdentifier A unique character to identify the
      *                                      category option group.
      * @param categoryOptions               the category options.
      * @return CategoryOptionGroup
      */
-    public static CategoryOptionGroup createCategoryOptionGroup( char categoryGroupUniqueIdentifier,
+    public static CategoryOptionGroup createCategoryOptionGroup( char uniqueIdentifier,
         DataElementCategoryOption... categoryOptions )
     {
-        CategoryOptionGroup categoryOptionGroup = new CategoryOptionGroup( "CategoryOptionGroup" + categoryGroupUniqueIdentifier );
+        CategoryOptionGroup categoryOptionGroup = new CategoryOptionGroup( "CategoryOptionGroup" + uniqueIdentifier );
+        categoryOptionGroup.setShortName( "ShortName" + uniqueIdentifier );
         categoryOptionGroup.setAutoFields();
 
         categoryOptionGroup.setMembers( new HashSet<DataElementCategoryOption>() );