=== 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	2015-08-30 17:45:53 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java	2015-08-30 19:18:52 +0000
@@ -491,7 +491,6 @@
         categoryOptionCombo.setAutoFields();
 
         categoryOptionCombo.setCategoryCombo( categoryCombo );
-        categoryCombo.getOptionCombos().add( categoryOptionCombo );
 
         for ( DataElementCategoryOption categoryOption : categoryOptions )
         {